diff --git a/.github/workflows/android-test.yml b/.github/workflows/android-test.yml
index 7deb391cb2..eabd584e2c 100644
--- a/.github/workflows/android-test.yml
+++ b/.github/workflows/android-test.yml
@@ -14,13 +14,14 @@ jobs:
       matrix:
         include:
           - api-level: 34
+            jdk-version: 21
             arch: x86_64
     steps:
       - uses: actions/checkout@v4
-      - name: set up JDK 21
+      - name: set up JDK ${{ matrix.jdk-version }}
         uses: actions/setup-java@v4
         with:
-          java-version: '21'
+          jdk-version: ${{ matrix.jdk-version }}
           distribution: 'temurin'
       - uses: gradle/actions/setup-gradle@v3
 
@@ -31,7 +32,7 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-${{ matrix.api-level }}
+          key: avd-${{ matrix.jdk-version }}-${{ matrix.api-level }}
 
       - name: create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'