diff --git a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
index 54c40f6..4b7114d 100644
--- a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
+++ b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
@@ -160,6 +160,7 @@ public function renderResponse(array $main_content, Request $request, RouteMatch
     // Also associate the "rendered" cache tag. This allows us to invalidate the
     // entire render cache, regardless of the cache bin.
     $content['#cache']['tags'][] = 'rendered';
+    $content['#cache']['tags'][] = 'config:core.extension';
 
     $response = new HtmlResponse($content, 200, [
       'Content-Type' => 'text/html; charset=UTF-8',
diff --git a/core/modules/block/block.install b/core/modules/block/block.install
index 106815c..ead2b52 100644
--- a/core/modules/block/block.install
+++ b/core/modules/block/block.install
@@ -8,16 +8,6 @@
 use Drupal\Core\Cache\Cache;
 
 /**
- * Implements hook_install().
- */
-function block_install() {
-  // Because the Block module upon installation unconditionally overrides all
-  // HTML output by selecting a different page display variant, we must
-  // invalidate all cached HTML output.
-  Cache::invalidateTags(['rendered']);
-}
-
-/**
  * @addtogroup updates-8.0.0-beta
  * @{
  */