core/modules/views/src/Entity/View.php             |  3 +--
 core/modules/views/src/Plugin/views/PluginBase.php |  9 ++++++++-
 .../views/src/Plugin/views/display/Page.php        | 14 +++++++++++++
 .../views/src/Plugin/views/filter/Bundle.php       | 23 ++++++++++++++++++++++
 4 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/core/modules/views/src/Entity/View.php b/core/modules/views/src/Entity/View.php
index 167f169..0f0543c 100644
--- a/core/modules/views/src/Entity/View.php
+++ b/core/modules/views/src/Entity/View.php
@@ -254,8 +254,7 @@ public function calculateDependencies() {
 
     foreach ($executable->displayHandlers as $display) {
       // Add dependency for the display itself.
-      /** @var \Drupal\views\Plugin\views\display\DisplayPluginBase $display */
-      $this->addDependency('module', $display->getProvider());
+      $this->calculatePluginDependencies($display);
 
       // Collect all dependencies of all handlers.
       foreach ($handler_types as $handler_type) {
diff --git a/core/modules/views/src/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php
index 7992378..7aed781 100644
--- a/core/modules/views/src/Plugin/views/PluginBase.php
+++ b/core/modules/views/src/Plugin/views/PluginBase.php
@@ -388,7 +388,14 @@ public static function preRenderFlattenData($form) {
    * {@inheritdoc}
    */
   public function calculateDependencies() {
-    return [];
+    $dependencies = [];
+
+    $provider = $this->getProvider();
+    if ($provider !== 'views') {
+      $dependencies['module'][] = $provider;
+    }
+
+    return $dependencies;
   }
 
   /**
diff --git a/core/modules/views/src/Plugin/views/display/Page.php b/core/modules/views/src/Plugin/views/display/Page.php
index 3dd9a3d..21bb7bf 100644
--- a/core/modules/views/src/Plugin/views/display/Page.php
+++ b/core/modules/views/src/Plugin/views/display/Page.php
@@ -425,4 +425,18 @@ public function getPagerText() {
     );
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    $dependencies = parent::calculateDependencies();
+
+    $menu = $this->getOption('menu');
+    if ($menu['type'] === 'normal') {
+      $dependencies['config'][] = 'menu.' . $menu['menu_name'];
+    }
+
+    return $dependencies;
+  }
+
 }
diff --git a/core/modules/views/src/Plugin/views/filter/Bundle.php b/core/modules/views/src/Plugin/views/filter/Bundle.php
index 614a75c..1f53a02 100644
--- a/core/modules/views/src/Plugin/views/filter/Bundle.php
+++ b/core/modules/views/src/Plugin/views/filter/Bundle.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Plugin\views\filter;
 
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 
@@ -73,4 +74,26 @@ public function query() {
     parent::query();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    $dependencies = parent::calculateDependencies();
+
+    $bundle_entity_type = $this->entityType->getBundleEntityType();
+    $bundle_entity_storage = \Drupal::entityManager()->getStorage($bundle_entity_type);
+
+    foreach (array_keys($this->value) as $bundle) {
+      $bundle_entity = $bundle_entity_storage->load($bundle);
+      if ($bundle_entity instanceof ConfigEntityInterface) {
+        $dependencies['config'][] = $this->entityTypeId . '.' . $bundle_entity_type . '.' . $bundle;
+      }
+      else {
+        $dependencies['content'][] = $bundle_entity_type . ':' . $bundle_entity->uuid();
+      }
+    }
+
+    return $dependencies;
+  }
+
 }