Issue #3469286 by tim bozeman: Navigation module integration

src/SectionStorageHandler.php

@@ -176,8 +176,12 @@ class SectionStorageHandler {
       } while (!empty($nested_storage_pieces));
     }
 
-    if ($this->moduleHandler->moduleExists('edit_plus') && $entity = $section_storage->getContextValue('entity')) {
-      Cache::invalidateTags([getCacheTag($entity)]);
+    if ($this->moduleHandler->moduleExists('edit_plus')) {
+      $contexts = $section_storage->getContexts();
+      if (!empty($contexts['entity'])) {
+        $entity = $section_storage->getContextValue('entity');
+        Cache::invalidateTags([getCacheTag($entity)]);
+      }
     }
 
     $this->layoutBuilderTempstore->set($section_storage);