From 82ec597cc6bbd4226b99fbcfbab67e535830ffb9 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 17 Mar 2026 16:21:42 +0000
Subject: [PATCH] Add blink caching to collection and forms

---
 src/Entries/EntryQueryBuilder.php    | 2 +-
 src/Forms/SubmissionQueryBuilder.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Entries/EntryQueryBuilder.php b/src/Entries/EntryQueryBuilder.php
index 554642bc..4ad9aa77 100644
--- a/src/Entries/EntryQueryBuilder.php
+++ b/src/Entries/EntryQueryBuilder.php
@@ -154,7 +154,7 @@ private function getCollectionsForStatusQuery(): \Illuminate\Support\Collection
         return collect($this->builder->getQuery()->wheres)
             ->where('column', 'collection')
             ->flatMap(fn ($where) => $where['values'] ?? [$where['value']])
-            ->map(fn ($handle) => Collection::find($handle));
+            ->map(fn ($handle) => Blink::once("eloquent-collection-{$handle}", fn () => Collection::find($handle)));
     }
 
     private function getKeysForTaxonomyWhereBasic($where)
diff --git a/src/Forms/SubmissionQueryBuilder.php b/src/Forms/SubmissionQueryBuilder.php
index c58b148c..e0e0c90a 100644
--- a/src/Forms/SubmissionQueryBuilder.php
+++ b/src/Forms/SubmissionQueryBuilder.php
@@ -4,6 +4,7 @@
 
 use Statamic\Contracts\Forms\SubmissionQueryBuilder as BuilderContract;
 use Statamic\Data\DataCollection;
+use Statamic\Facades\Blink;
 use Statamic\Facades\Form;
 use Statamic\Query\EloquentQueryBuilder;
 use Statamic\Support\Str;
@@ -37,7 +38,7 @@ protected function transform($items, $columns = [])
     {
         return DataCollection::make($items)->map(function ($model) {
             return Submission::fromModel($model)
-                ->form(Form::find($model->form));
+                ->form(Blink::once("eloquent-forms-{$model->form}", fn () => Form::find($model->form)));
         });
     }