diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 47af7977..10cbc78e 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -26,7 +26,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
         java: [8, 11, 16, 17-ea]
-        jdk: [adopt-hotspot, zulu, adopt-openj9]
+        jdk: [temurin, zulu, adopt-openj9]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
@@ -45,8 +45,9 @@ jobs:
             maven-${{ matrix.os }}-
 
       - name: Set up JDK
-        uses: actions/setup-java@v2.2.0
+        uses: actions/setup-java@v2.3.0
         with:
+          cache: 'maven'
           distribution: ${{ matrix.jdk }}
           java-version: ${{ matrix.java }}