diff --git a/.changeset/dull-horses-taste.md b/.changeset/dull-horses-taste.md
new file mode 100644
index 0000000..6f37078
--- /dev/null
+++ b/.changeset/dull-horses-taste.md
@@ -0,0 +1,5 @@
+---
+"create-solana-program": patch
+---
+
+Cache and restore external accounts
diff --git a/template/base/.github/workflows/main.yml.njk b/template/base/.github/workflows/main.yml.njk
index 97e28f1..17ee5d2 100644
--- a/template/base/.github/workflows/main.yml.njk
+++ b/template/base/.github/workflows/main.yml.njk
@@ -92,10 +92,12 @@ jobs:
           path: ./target/deploy/*.so
           if-no-files-found: error
 
-      - name: Save Program Builds For Client Jobs
+      - name: Save Client Artifacts
         uses: actions/cache/save@v4
         with:
-          path: ./**/*.so
+          path: |
+            ./**/*.so
+            ./target/deploy/*.json
           key: {% raw %}${{ runner.os }}-builds-${{ github.sha }}{% endraw %}
 
   test_programs:
@@ -182,10 +184,12 @@ jobs:
         with:
           solana: true
 
-      - name: Restore Program Builds
+      - name: Restore Client Artifacts
         uses: actions/cache/restore@v4
         with:
-          path: ./**/*.so
+          path: |
+            ./**/*.so
+            ./target/deploy/*.json
           key: {% raw %}${{ runner.os }}-builds-${{ github.sha }}{% endraw %}
 
       - name: Test Client JS