diff --git a/core/lib/Drupal/Component/Plugin/PluginBag.php b/core/lib/Drupal/Component/Plugin/PluginBag.php
new file mode 100644
index 0000000..34a960c
--- /dev/null
+++ b/core/lib/Drupal/Component/Plugin/PluginBag.php
@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Component\Plugin\PluginBag.
+ */
+
+namespace Drupal\Component\Plugin;
+
+/**
+ * Defines an object which stores multiple plugin instances to allow lazy initialization.
+ */
+abstract class PluginBag implements \ArrayAccess, \Iterator, \Countable {
+
+  /**
+   * Stores all instantiated plugins.
+   *
+   * @var array
+   */
+  protected $pluginInstances = array();
+
+  /**
+   * Stores the IDs of all potential plugin instances.
+   *
+   * @var array
+   */
+  protected $instanceIDs = array();
+
+  /**
+   * Initializes a plugin and stores the result in $this->pluginInstances.
+   *
+   * @param string $instance_id
+   *   The ID of the plugin instance to initialize.
+   */
+  abstract protected function initializePlugin($instance_id);
+
+  /**
+   * Clears all instantiated plugins.
+   */
+  public function clear() {
+    $this->pluginInstances = array();
+  }
+
+  /**
+   * Implements \ArrayAccess::offsetExists().
+   */
+  public function offsetExists($offset) {
+    return isset($this->pluginInstances[$offset]) || isset($this->instanceIDs[$offset]);
+  }
+
+  /**
+   * Implements \ArrayAccess::offsetGet().
+   */
+  public function offsetGet($offset) {
+    if (!isset($this->pluginInstances[$offset])) {
+      $this->initializePlugin($offset);
+    }
+    return $this->pluginInstances[$offset];
+  }
+
+  /**
+   * Implements \ArrayAccess::offsetSet().
+   */
+  public function offsetSet($offset, $value) {
+    $this->pluginInstances[$offset] = $value;
+  }
+
+  /**
+   * Implements \ArrayAccess::offsetUnset().
+   */
+  public function offsetUnset($offset) {
+    unset($this->pluginInstances[$offset]);
+  }
+
+  /**
+   * Implements \Iterator::current().
+   */
+  public function current() {
+    return $this->offsetGet($this->key());
+  }
+
+  /**
+   * Implements \Iterator::next().
+   */
+  public function next() {
+    next($this->instanceIDs);
+  }
+
+  /**
+   * Implements \Iterator::key().
+   */
+  public function key() {
+    return key($this->instanceIDs);
+  }
+
+  /**
+   * Implements \Iterator::valid().
+   */
+  public function valid() {
+    $key = key($this->instanceIDs);
+    return $key !== NULL && $key !== FALSE;
+  }
+
+  /**
+   * Implements \Iterator::rewind().
+   */
+  public function rewind() {
+    reset($this->instanceIDs);
+  }
+
+  /**
+   * Implements \Countable::count().
+   */
+  public function count() {
+    return count($this->instanceIDs);
+  }
+
+}
diff --git a/core/modules/views/lib/Drupal/views/DisplayArray.php b/core/modules/views/lib/Drupal/views/DisplayArray.php
deleted file mode 100644
index 35be37e..0000000
--- a/core/modules/views/lib/Drupal/views/DisplayArray.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\DisplayArray.
- */
-
-namespace Drupal\views;
-
-/**
- * A class which wraps the displays of a view so you can lazy-initialize them.
- */
-class DisplayArray implements \ArrayAccess, \Iterator, \Countable {
-
-  /**
-   * Stores a reference to the view which has this displays attached.
-   *
-   * @var \Drupal\views\ViewExecutable
-   */
-  protected $view;
-
-  /**
-   * Stores the actual display instances in an array.
-   *
-   * @var array
-   */
-  protected $displayHandlers = array();
-
-  /**
-   * Stores all display IDs, coming from $this->view->storage->get('display').
-   *
-   * @var array
-   */
-  protected $displayIDs;
-
-  /**
-   * Constructs a DisplayArray object.
-   *
-   * @param \Drupal\views\ViewExecutable
-   *   The view which has this displays attached.
-   */
-  public function __construct(ViewExecutable $view) {
-    $this->view = $view;
-
-    $this->initializeDisplay('default');
-
-    // Store all display IDs to access them easy and fast.
-    $display = $this->view->storage->get('display');
-    $this->displayIDs = drupal_map_assoc(array_keys($display));
-  }
-
-  /**
-   * Destructs a DisplayArray object.
-   */
-  public function __destruct() {
-    foreach ($this->displayHandlers as $display_id => $display) {
-      $display->destroy();
-      unset($this->displayHandlers[$display_id]);
-    }
-  }
-
-  /**
-   * Initializes a single display and stores the result in $this->displayHandlers.
-   *
-   * @param string $display_id
-   *   The name of the display to initialize.
-   */
-  protected function initializeDisplay($display_id) {
-    // If the display was initialized before, just return.
-    if (isset($this->displayHandlers[$display_id])) {
-      return;
-    }
-
-    // Retrieve and initialize the new display handler with data.
-    $display = &$this->view->storage->getDisplay($display_id);
-    $this->displayHandlers[$display_id] = drupal_container()->get("plugin.manager.views.display")->createInstance($display['display_plugin']);
-    if (empty($this->displayHandlers[$display_id])) {
-      // Provide a 'default' handler as an emergency. This won't work well but
-      // it will keep things from crashing.
-      $this->displayHandlers[$display_id] = drupal_container()->get("plugin.manager.views.display")->createInstance('default');
-    }
-
-    $this->displayHandlers[$display_id]->init($this->view, $display);
-    // If this is not the default display handler, let it know which is since
-    // it may well utilize some data from the default.
-    if ($display_id != 'default') {
-      $this->displayHandlers[$display_id]->default_display = $this->displayHandlers['default'];
-    }
-  }
-
-  /**
-   * Implements \ArrayAccess::offsetExists().
-   */
-  public function offsetExists($offset) {
-    return isset($this->displayHandlers[$offset]) || isset($this->displayIDs[$offset]);
-  }
-
-  /**
-   * Implements \ArrayAccess::offsetGet().
-   */
-  public function offsetGet($offset) {
-    if (!isset($this->displayHandlers[$offset])) {
-      $this->initializeDisplay($offset);
-    }
-    return $this->displayHandlers[$offset];
-  }
-
-  /**
-   * Implements \ArrayAccess::offsetSet().
-   */
-  public function offsetSet($offset, $value) {
-    $this->displayHandlers[$offset] = $value;
-  }
-
-  /**
-   * Implements \ArrayAccess::offsetUnset().
-   */
-  public function offsetUnset($offset) {
-    unset($this->displayHandlers[$offset]);
-  }
-
-  /**
-   * Implements \Iterator::current().
-   */
-  public function current() {
-    return $this->offsetGet($this->key());
-  }
-
-  /**
-   * Implements \Iterator::next().
-   */
-  public function next() {
-    next($this->displayIDs);
-  }
-
-  /**
-   * Implements \Iterator::key().
-   */
-  public function key() {
-    return key($this->displayIDs);
-  }
-
-  /**
-   * Implements \Iterator::valid().
-   */
-  public function valid() {
-    $key = key($this->displayIDs);
-    return $key !== NULL && $key !== FALSE;
-  }
-
-  /**
-   * Implements \Iterator::rewind().
-   */
-  public function rewind() {
-    reset($this->displayIDs);
-  }
-
-  /**
-   * Implements \Countable::count().
-   */
-  public function count() {
-    return count($this->displayIDs);
-  }
-
-}
diff --git a/core/modules/views/lib/Drupal/views/DisplayBag.php b/core/modules/views/lib/Drupal/views/DisplayBag.php
new file mode 100644
index 0000000..809b0ae
--- /dev/null
+++ b/core/modules/views/lib/Drupal/views/DisplayBag.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\DisplayBag.
+ */
+
+namespace Drupal\views;
+
+use Drupal\Component\Plugin\PluginBag;
+
+/**
+ * A class which wraps the displays of a view so you can lazy-initialize them.
+ */
+class DisplayBag extends PluginBag {
+
+  /**
+   * Stores a reference to the view which has this displays attached.
+   *
+   * @var \Drupal\views\ViewExecutable
+   */
+  protected $view;
+
+  /**
+   * Constructs a DisplayBag object.
+   *
+   * @param \Drupal\views\ViewExecutable
+   *   The view which has this displays attached.
+   */
+  public function __construct(ViewExecutable $view) {
+    $this->view = $view;
+
+    $this->initializePlugin('default');
+
+    // Store all display IDs to access them easy and fast.
+    $display = $this->view->storage->get('display');
+    $this->instanceIDs = drupal_map_assoc(array_keys($display));
+  }
+
+  /**
+   * Destructs a DisplayBag object.
+   */
+  public function __destruct() {
+    $this->clear();
+  }
+
+  /**
+   * Overrides \Drupal\Component\Plugin\PluginBag::clear().
+   */
+  public function clear() {
+    foreach ($this->pluginInstances as $display_id => $display) {
+      $display->destroy();
+    }
+
+    parent::clear();
+  }
+
+  /**
+   * Overrides \Drupal\Component\Plugin\PluginBag::initializePlugin().
+   */
+  protected function initializePlugin($display_id) {
+    // If the display was initialized before, just return.
+    if (isset($this->pluginInstances[$display_id])) {
+      return;
+    }
+
+    // Retrieve and initialize the new display handler with data.
+    $display = &$this->view->storage->getDisplay($display_id);
+    $this->pluginInstances[$display_id] = drupal_container()->get("plugin.manager.views.display")->createInstance($display['display_plugin']);
+    if (empty($this->pluginInstances[$display_id])) {
+      // Provide a 'default' handler as an emergency. This won't work well but
+      // it will keep things from crashing.
+      $this->pluginInstances[$display_id] = drupal_container()->get("plugin.manager.views.display")->createInstance('default');
+    }
+
+    $this->pluginInstances[$display_id]->init($this->view, $display);
+    // If this is not the default display handler, let it know which is since
+    // it may well utilize some data from the default.
+    if ($display_id != 'default') {
+      $this->pluginInstances[$display_id]->default_display = $this->pluginInstances['default'];
+    }
+  }
+
+}
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php
index b4ab8c2..48f5ce8 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\views\Tests;
 
 use Drupal\views\ViewExecutable;
-use Drupal\views\DisplayArray;
+use Drupal\views\DisplayBag;
 use Drupal\views\Plugin\views\display\DefaultDisplay;
 use Drupal\views\Plugin\views\display\Page;
 
@@ -120,7 +120,7 @@ public function testDisplays() {
 
     // Tests Drupal\views\ViewExecutable::initDisplay().
     $view->initDisplay();
-    $this->assertTrue($view->displayHandlers instanceof DisplayArray, 'The displayHandlers property has the right class.');
+    $this->assertTrue($view->displayHandlers instanceof DisplayBag, 'The displayHandlers property has the right class.');
     // Tests the classes of the instances.
     $this->assertTrue($view->displayHandlers['default'] instanceof DefaultDisplay);
     $this->assertTrue($view->displayHandlers['page'] instanceof Page);
diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php
index 6a8f79c..cc49008 100644
--- a/core/modules/views/lib/Drupal/views/ViewExecutable.php
+++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php
@@ -597,7 +597,7 @@ public function initDisplay() {
     }
 
     // Initialize the display cache array.
-    $this->displayHandlers = new DisplayArray($this);
+    $this->displayHandlers = new DisplayBag($this);
 
     $this->current_display = 'default';
     $this->display_handler = $this->displayHandlers['default'];