.../Core/Block/MainContentBlockPluginInterface.php  |  2 +-
 .../Block/NonLazyBuildableBlockPluginInterface.php  | 21 ---------------------
 .../Core/Block/StatefulBlockPluginInterface.php     | 18 ++++++++++++++++++
 core/modules/block/src/BlockViewBuilder.php         | 14 +++++++-------
 .../src/Plugin/Block/ViewsExposedFilterBlock.php    |  4 ++--
 5 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/core/lib/Drupal/Core/Block/MainContentBlockPluginInterface.php b/core/lib/Drupal/Core/Block/MainContentBlockPluginInterface.php
index 4797830..605edce 100644
--- a/core/lib/Drupal/Core/Block/MainContentBlockPluginInterface.php
+++ b/core/lib/Drupal/Core/Block/MainContentBlockPluginInterface.php
@@ -14,7 +14,7 @@
  *
  * @ingroup block_api
  */
-interface MainContentBlockPluginInterface extends NonLazyBuildableBlockPluginInterface {
+interface MainContentBlockPluginInterface extends StatefulBlockPluginInterface {
 
   /**
    * Sets the main content render array.
diff --git a/core/lib/Drupal/Core/Block/NonLazyBuildableBlockPluginInterface.php b/core/lib/Drupal/Core/Block/NonLazyBuildableBlockPluginInterface.php
deleted file mode 100644
index dad1227..0000000
--- a/core/lib/Drupal/Core/Block/NonLazyBuildableBlockPluginInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\Block\NonLazyBuildableBlockPluginInterface.
- */
-
-namespace Drupal\Core\Block;
-
-/**
- * The interface for blocks that cannot be lazily built.
- *
- * For blocks that depend on the original request context, and can therefore not
- * be lazily built.
- *
- * @see \Drupal\Core\Block\MainContentBlockPluginInterface
- * @see \Drupal\views\Plugin\Block\ViewsExposedFilterBlock
- *
- * @ingroup block_api
- */
-interface NonLazyBuildableBlockPluginInterface extends BlockPluginInterface { }
diff --git a/core/lib/Drupal/Core/Block/StatefulBlockPluginInterface.php b/core/lib/Drupal/Core/Block/StatefulBlockPluginInterface.php
new file mode 100644
index 0000000..d52ea18
--- /dev/null
+++ b/core/lib/Drupal/Core/Block/StatefulBlockPluginInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Block\StatefulBlockPluginInterface.
+ */
+
+namespace Drupal\Core\Block;
+
+/**
+ * The interface for blocks that carry state and can hence not be lazily built.
+ *
+ * @see \Drupal\Core\Block\MainContentBlockPluginInterface
+ * @see \Drupal\views\Plugin\Block\ViewsExposedFilterBlock
+ *
+ * @ingroup block_api
+ */
+interface StatefulBlockPluginInterface extends BlockPluginInterface { }
diff --git a/core/modules/block/src/BlockViewBuilder.php b/core/modules/block/src/BlockViewBuilder.php
index 0a6b1a9..1703146 100644
--- a/core/modules/block/src/BlockViewBuilder.php
+++ b/core/modules/block/src/BlockViewBuilder.php
@@ -9,7 +9,7 @@
 
 use Drupal\block\Entity\Block;
 use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Core\Block\NonLazyBuildableBlockPluginInterface;
+use Drupal\Core\Block\StatefulBlockPluginInterface;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Entity\EntityViewBuilder;
@@ -63,12 +63,12 @@ public function viewMultiple(array $entities = array(), $view_mode = 'full', $la
         ],
       );
 
-      // Some blocks cannot be lazily built (using #lazy_builder callbacks). For
-      // example: the main content block and Views exposed filter blocks. They
-      // depend on the original request context, can hence not be generated out
-      // of band, and can consequently not be built lazily. In other words: they
-      // cannot be rendered using ESI, BigPipe, or other similar techniques.
-      if ($plugin instanceof NonLazyBuildableBlockPluginInterface) {
+      // Some blocks are stateful (carry properties, hence have state) and can
+      // therefore not be lazily built (using #lazy_builder callbacks). For
+      // example: the main content block, which gets the main content injected.
+      // If they were lazily built, then we would not have any way to recreate
+      // the original state.
+      if ($plugin instanceof StatefulBlockPluginInterface) {
         // Immediately build a #pre_render-able block, since this block cannot
         // be built lazily.
         $build[$entity_id] += self::buildPreRenderableBlock($entity, $this->moduleHandler());
diff --git a/core/modules/views/src/Plugin/Block/ViewsExposedFilterBlock.php b/core/modules/views/src/Plugin/Block/ViewsExposedFilterBlock.php
index b79e62b..8a62972 100644
--- a/core/modules/views/src/Plugin/Block/ViewsExposedFilterBlock.php
+++ b/core/modules/views/src/Plugin/Block/ViewsExposedFilterBlock.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugin\Block;
 
-use Drupal\Core\Block\NonLazyBuildableBlockPluginInterface;
+use Drupal\Core\Block\StatefulBlockPluginInterface;
 
 /**
  * Provides a 'Views Exposed Filter' block.
@@ -18,7 +18,7 @@
  *   deriver = "Drupal\views\Plugin\Derivative\ViewsExposedFilterBlock"
  * )
  */
-class ViewsExposedFilterBlock extends ViewsBlockBase implements NonLazyBuildableBlockPluginInterface {
+class ViewsExposedFilterBlock extends ViewsBlockBase implements StatefulBlockPluginInterface {
 
   /**
    * {@inheritdoc}