 core/core.services.yml                                   |  2 +-
 core/lib/Drupal/Core/Render/RenderCache.php              | 16 ++++++++++++++--
 core/tests/Drupal/Tests/Core/Render/RendererTestBase.php |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/core/core.services.yml b/core/core.services.yml
index 5a9cd6e..d3a0b7c 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -1374,7 +1374,7 @@ services:
     lazy: true
   render_cache:
     class: Drupal\Core\Render\RenderCache
-    arguments: ['@request_stack', '@cache_factory', '@cache_contexts_manager']
+    arguments: ['@request_stack', '@cache_factory', '@cache_contexts_manager', '%renderer.config%']
   renderer:
     class: Drupal\Core\Render\Renderer
     arguments: ['@controller_resolver', '@theme.manager', '@plugin.manager.element_info', '@render_cache', '%renderer.config%']
diff --git a/core/lib/Drupal/Core/Render/RenderCache.php b/core/lib/Drupal/Core/Render/RenderCache.php
index 776bfd4..024b7d1 100644
--- a/core/lib/Drupal/Core/Render/RenderCache.php
+++ b/core/lib/Drupal/Core/Render/RenderCache.php
@@ -39,6 +39,13 @@ class RenderCache implements RenderCacheInterface {
   protected $cacheContextsManager;
 
   /**
+   * The renderer configuration array.
+   *
+   * @var array
+   */
+  protected $rendererConfig;
+
+  /**
    * Constructs a new RenderCache object.
    *
    * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
@@ -47,11 +54,14 @@ class RenderCache implements RenderCacheInterface {
    *   The cache factory.
    * @param \Drupal\Core\Cache\Context\CacheContextsManager $cache_contexts_manager
    *   The cache contexts manager.
+   * @param array $renderer_config
+   *   The renderer configuration array.
    */
-  public function __construct(RequestStack $request_stack, CacheFactoryInterface $cache_factory, CacheContextsManager $cache_contexts_manager) {
+  public function __construct(RequestStack $request_stack, CacheFactoryInterface $cache_factory, CacheContextsManager $cache_contexts_manager, array $renderer_config) {
     $this->requestStack = $request_stack;
     $this->cacheFactory = $cache_factory;
     $this->cacheContextsManager = $cache_contexts_manager;
+    $this->rendererConfig = $renderer_config;
   }
 
   /**
@@ -207,9 +217,11 @@ public function set(array &$elements, array $pre_bubbling_elements) {
       // across requests. That's the strategy employed below and tested in
       // \Drupal\Tests\Core\Render\RendererBubblingTest::testConditionalCacheContextBubblingSelfHealing().
 
+      $required_cache_contexts = $this->rendererConfig['required_cache_contexts'];
+
       // The set of cache contexts for this element, including the bubbled ones,
       // for which we are handling a cache miss.
-      $cache_contexts = $data['#cache']['contexts'];
+      $cache_contexts = Cache::mergeContexts($data['#cache']['contexts'], $required_cache_contexts);
 
       // Get the contexts by which this element should be varied according to
       // the current redirecting cache item, if any.
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
index 7388c61..9055802 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
@@ -126,7 +126,7 @@ protected function setUp() {
         }
         return $keys;
       });
-    $this->renderCache = new RenderCache($this->requestStack, $this->cacheFactory, $this->cacheContextsManager);
+    $this->renderCache = new RenderCache($this->requestStack, $this->cacheFactory, $this->cacheContextsManager, $this->rendererConfig);
     $this->renderer = new Renderer($this->controllerResolver, $this->themeManager, $this->elementInfo, $this->renderCache, $this->rendererConfig);
 
     $container = new ContainerBuilder();
