From aab551a28c0118de3bda7ca431e2b85350d6ae0a Mon Sep 17 00:00:00 2001
From: Jonathan Wu <jtwu@google.com>
Date: Wed, 8 Apr 2026 20:16:03 -0400
Subject: [PATCH 1/2] Modify caching to mirror _request.yml

Signed-off-by: Jonathan Wu <jtwu@google.com>
---
 .github/workflows/_load_env.yml | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/_load_env.yml b/.github/workflows/_load_env.yml
index 426fda17765b9..1454904aeaf82 100644
--- a/.github/workflows/_load_env.yml
+++ b/.github/workflows/_load_env.yml
@@ -1,3 +1,4 @@
+
 name: Request/load
 
 permissions:
@@ -60,6 +61,7 @@ jobs:
     outputs:
       build-image: ${{ toJSON(fromJSON(steps.env.outputs.data).request.build-image) }}
       build-image-mobile: ${{ fromJSON(steps.env.outputs.data).request.build-image-mobile }}
+      caches: ${{ steps.caches.outputs.value }}
       request: ${{ steps.env.outputs.data }}
       trusted: true
     steps:
@@ -101,6 +103,33 @@ jobs:
         ref: ${{ fromJSON(steps.env.outputs.data).request.ref }}
         sha: ${{ fromJSON(steps.env.outputs.data).request.sha }}
         target-branch: ${{ fromJSON(steps.env.outputs.data).request.target-branch }}
+        
+    - name: Check Docker cache (x64)
+      id: cache-exists-docker-x64
+      uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7  # v5.0.4
+      with:
+        lookup-only: true
+        path: /tmp/cache
+        key: ${{ fromJSON(steps.env.outputs.data).request.build-image.default }}-x64
+        
+    - name: Check Docker cache (arm64)
+      id: cache-exists-docker-arm64
+      uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7  # v5.0.4
+      with:
+        lookup-only: true
+        path: /tmp/cache
+        key: ${{ fromJSON(steps.env.outputs.data).request.build-image.default }}-arm64
+
+    - name: Caches
+      uses: envoyproxy/toolshed/actions/jq@8d5d8d4b9eeb5e4e76b92341b0b1b1f6438af231  # v0.4.5
+      id: caches
+      with:
+        input-format: yaml
+        filter: .
+        input: |
+          docker:
+            x64: "${{ steps.cache-exists-docker-x64.outputs.cache-hit || 'false' }}"
+            arm64: "${{ steps.cache-exists-docker-arm64.outputs.cache-hit || 'false' }}"
 
   cache:
     secrets:
@@ -110,5 +139,5 @@ jobs:
     needs: request
     if: ${{ inputs.cache-docker }}
     with:
-      request: ${{ toJSON(needs.request.outputs) }}
+      caches: ${{ needs.request.outputs.caches }}
       image-tag: ${{ fromJSON(needs.request.outputs.build-image).default }}

From 6844a74ae117d9b31dab999a8d6e6671691dfda3 Mon Sep 17 00:00:00 2001
From: Jonathan Wu <jtwu@google.com>
Date: Wed, 8 Apr 2026 20:17:25 -0400
Subject: [PATCH 2/2] Remove empty line from _load_env.yml

Signed-off-by: Jonathan Wu <jtwu@google.com>
---
 .github/workflows/_load_env.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/_load_env.yml b/.github/workflows/_load_env.yml
index 1454904aeaf82..6515932b27a66 100644
--- a/.github/workflows/_load_env.yml
+++ b/.github/workflows/_load_env.yml
@@ -1,4 +1,3 @@
-
 name: Request/load
 
 permissions: