diff --git a/.github/actions/gradle-setup/action.yml b/.github/actions/gradle-setup/action.yml
index 3753210b8..a42959190 100644
--- a/.github/actions/gradle-setup/action.yml
+++ b/.github/actions/gradle-setup/action.yml
@@ -27,19 +27,14 @@ runs:
         distribution: ${{ inputs.jdk_distribution }}
         token: ${{ github.token }}
 
-    # Robolectric downloads instrumented SDK jars from Maven Central at test time.
-    # Cache them to avoid flaky SocketException failures on CI runners.
-    # Update the key when bumping robolectric version in libs.versions.toml or sdk in robolectric.properties.
-    - name: Cache Robolectric SDK jars
-      uses: actions/cache@v5
-      with:
-        path: ~/.m2/repository/org/robolectric
-        key: robolectric-4.16.1-sdk34
-
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v6
       with:
         cache-read-only: ${{ inputs.cache_read_only }}
         cache-encryption-key: ${{ inputs.gradle_encryption_key }}
         cache-cleanup: on-success
-        add-job-summary: always
\ No newline at end of file
+        add-job-summary: always
+        gradle-home-cache-includes: |
+          caches
+          notifications
+          ~/.m2/repository/org/robolectric
\ No newline at end of file