diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
index eb006c0..25c6840 100644
--- a/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -2211,7 +2211,8 @@ public function serialize() {
       $this->args,
       $this->current_page,
       $this->exposed_input,
-      $this->exposed_data
+      $this->exposed_data,
+      $this->dom_id
     ]);
   }
 
@@ -2219,7 +2220,7 @@ public function serialize() {
    * {@inheritdoc}
    */
   public function unserialize($serialized) {
-    list($storage_id, $current_display, $args, $current_page, $exposed_input, $exposed_data) = unserialize($serialized);
+    list($storage_id, $current_display, $args, $current_page, $exposed_input, $exposed_data, $dom_id) = unserialize($serialized);
 
     $this->setRequest(\Drupal::request());
     $this->user = \Drupal::currentUser();
diff --git a/core/modules/views_ui/src/ViewUI.php b/core/modules/views_ui/src/ViewUI.php
index 58a1734..440cc9c 100644
--- a/core/modules/views_ui/src/ViewUI.php
+++ b/core/modules/views_ui/src/ViewUI.php
@@ -816,14 +816,14 @@ public function cacheSet() {
     if (isset($executable->current_display)) {
       // Add the knowledge of the changed display, too.
       $this->changed_display[$executable->current_display] = TRUE;
-      unset($executable->current_display);
+      $executable->current_display = NULL;
     }
 
-    // Unset handlers; we don't want to write these into the cache.
-    unset($executable->display_handler);
-    unset($executable->default_display);
+    // Unset handlers. We don't want to write these into the cache.
+    $executable->display_handler = NULL;
+    $executable->default_display = NULL;
     $executable->query = NULL;
-    unset($executable->displayHandlers);
+    $executable->displayHandlers = NULL;
     \Drupal::service('user.tempstore')->get('views')->set($this->id(), $this);
   }