diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index 1f67c6c..4a48ab8 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -136,7 +136,11 @@ public function getStorageController($entity_type) {
    *   A list controller instance.
    */
   public function getListController($entity_type) {
-    return $this->getController($entity_type, 'list');
+    if (!isset($this->controllers['listing'][$entity_type])) {
+      $class = $this->getControllerClass($entity_type, 'list');
+      $this->controllers['listing'][$entity_type] = new $class($entity_type, $this->getStorageController($entity_type));
+    }
+    return $this->controllers['listing'][$entity_type];
   }
 
   /**