diff --git a/.github/workflows/agp-matrix.yml b/.github/workflows/agp-matrix.yml
index 924da61b4c..5aa2525256 100644
--- a/.github/workflows/agp-matrix.yml
+++ b/.github/workflows/agp-matrix.yml
@@ -16,30 +16,6 @@ jobs:
         with:
           access_token: ${{ github.token }}
 
-  cache-avd:
-    runs-on: macos-latest
-    steps:
-      - name: AVD cache
-        uses: actions/cache@v3
-        id: avd-cache
-        with:
-          path: |
-            ~/.android/avd/*
-            ~/.android/adb*
-          key: aosp_atd
-
-      - name: create AVD and generate snapshot for caching
-        if: steps.avd-cache.outputs.cache-hit != 'true'
-        uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b # pin@v2
-        with:
-          api-level: 30
-          force-avd-creation: false
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: true
-          target: 'aosp_atd'
-          channel: canary # Necessary for ATDs
-          script: echo "Generated AVD snapshot for caching."
-
   agp-matrix-compatibility:
     timeout-minutes: 30
     runs-on: macos-latest
@@ -76,15 +52,7 @@ jobs:
       - name: Make stop
         run: make stop
 
-      - name: AVD cache
-        uses: actions/cache@v3
-        id: avd-cache
-        with:
-          path: |
-            ~/.android/avd/*
-            ~/.android/adb*
-          key: aosp_atd
-
+      # We tried to use the cache action to cache gradle stuff, but it made tests slower and timeout
       - name: Run instrumentation tests
         uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b # pin@v2
         with: