From 139ddc60f1c00c5af1a0df604f2b66dbe20c52a8 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Mon, 4 Mar 2024 10:55:36 +0000
Subject: [PATCH 1/2] Only retrieve from origin blink cache when its not null

---
 src/Data/HasOrigin.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/Data/HasOrigin.php b/src/Data/HasOrigin.php
index 186299cfad9..dabf92f1a25 100644
--- a/src/Data/HasOrigin.php
+++ b/src/Data/HasOrigin.php
@@ -60,9 +60,21 @@ public function origin($origin = null)
     {
         return $this->fluentlyGetOrSet('origin')
             ->getter(function ($origin) {
-                return $origin
-                    ? Blink::once($this->getOriginBlinkKey(), fn () => $this->getOriginByString($origin))
-                    : null;
+                if (! $origin) {
+                    return null;
+                }
+
+                if ($found = Blink::get($this->getOriginBlinkKey())) {
+                    return $found;
+                }
+
+                $found = $this->getOriginByString($origin);
+
+                if ($found) {
+                    Blink::put($this->getOriginBlinkKey(), $found);
+                }
+
+                return $found;
             })
             ->setter(function ($origin) {
                 Blink::forget($this->getOriginBlinkKey());

From b310576abc9a18d387efd18ff006d4be4113920d Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 4 Mar 2024 13:33:35 -0500
Subject: [PATCH 2/2] nitpick

---
 src/Data/HasOrigin.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Data/HasOrigin.php b/src/Data/HasOrigin.php
index dabf92f1a25..6f74a37ff92 100644
--- a/src/Data/HasOrigin.php
+++ b/src/Data/HasOrigin.php
@@ -68,13 +68,9 @@ public function origin($origin = null)
                     return $found;
                 }
 
-                $found = $this->getOriginByString($origin);
-
-                if ($found) {
+                return tap($this->getOriginByString($origin), function ($found) {
                     Blink::put($this->getOriginBlinkKey(), $found);
-                }
-
-                return $found;
+                });
             })
             ->setter(function ($origin) {
                 Blink::forget($this->getOriginBlinkKey());