diff --git a/.github/actions/setup-java-build/action.yml b/.github/actions/setup-java-build/action.yml
index 1ac444fe4..0539b0951 100644
--- a/.github/actions/setup-java-build/action.yml
+++ b/.github/actions/setup-java-build/action.yml
@@ -47,9 +47,10 @@ runs:
       uses: actions/cache@v3
       with:
         path: ~/.m2/build-cache
-        key: ${{ runner.os }}-buildcache-${{ hashFiles('.mvn/*.xml') }}-${{ github.ref_name }}-${{ github.run_id }}
+        key: ${{ runner.os }}-buildcache-${{ hashFiles('.mvn/*.xml') }}-${{ github.job }}-${{ github.ref_name }}-${{ github.run_id }}
         restore-keys: |
-          ${{ runner.os }}-buildcache-${{ hashFiles('.mvn/*.xml') }}-${{ github.ref_name }}-
+          ${{ runner.os }}-buildcache-${{ hashFiles('.mvn/*.xml') }}-${{ github.job }}-${{ github.ref_name }}-
+          ${{ runner.os }}-buildcache-${{ hashFiles('.mvn/*.xml') }}-${{ github.job }}-
           ${{ runner.os }}-buildcache-${{ hashFiles('.mvn/*.xml') }}-
           ${{ runner.os }}-buildcache-