From 82b15a75f27d508f2853cbcaebc8da2ca990aa8f Mon Sep 17 00:00:00 2001
From: John Koster <john@stillat.com>
Date: Sun, 3 Mar 2024 09:36:50 -0600
Subject: [PATCH 1/2] Cache structure on nav tree instance

---
 src/Structures/NavTree.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Structures/NavTree.php b/src/Structures/NavTree.php
index b46145e75e0..b908d16da14 100644
--- a/src/Structures/NavTree.php
+++ b/src/Structures/NavTree.php
@@ -14,9 +14,15 @@
 
 class NavTree extends Tree implements TreeContract
 {
+    protected $structureCache;
+
     public function structure()
     {
-        return Blink::once('nav-tree-structure-'.$this->handle(), function () {
+        if ($this->structureCache) {
+            return $this->structureCache;
+        }
+
+        return $this->structureCache = Blink::once('nav-tree-structure-'.$this->handle(), function () {
             return Nav::findByHandle($this->handle());
         });
     }

From 974583fcebccb11b55777292dd6b769f7185a5bf Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 12 Mar 2024 11:27:03 -0400
Subject: [PATCH 2/2] visibility

---
 src/Structures/NavTree.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Structures/NavTree.php b/src/Structures/NavTree.php
index b908d16da14..daef7f96e00 100644
--- a/src/Structures/NavTree.php
+++ b/src/Structures/NavTree.php
@@ -14,7 +14,7 @@
 
 class NavTree extends Tree implements TreeContract
 {
-    protected $structureCache;
+    private $structureCache;
 
     public function structure()
     {