diff --git a/.github/workflows/gh-pages-deploy.yml b/.github/workflows/gh-pages-deploy.yml
index 233cbfe..f44ddf9 100644
--- a/.github/workflows/gh-pages-deploy.yml
+++ b/.github/workflows/gh-pages-deploy.yml
@@ -14,16 +14,16 @@ jobs:
     steps:
       - uses: actions/checkout@v2.3.4
 
-      - uses: actions/setup-java@v1.4.3
-        with:
-          java-version: 8
-
       - uses: actions/cache@v1
         with:
           path: ~/.m2/repository
           key:          maven-site-deploy-${{ hashFiles('**/pom.xml') }}
           restore-keys: maven-site-deploy-
 
+      - uses: actions/setup-java@v1.4.3
+        with:
+          java-version: 8
+
       - uses: s4u/maven-settings-action@v2.2.0
         with:
           sonatypeSnapshots: true
diff --git a/.github/workflows/gh-pages-test.yml b/.github/workflows/gh-pages-test.yml
index e4ce1f3..8507f53 100644
--- a/.github/workflows/gh-pages-test.yml
+++ b/.github/workflows/gh-pages-test.yml
@@ -19,16 +19,16 @@ jobs:
     steps:
       - uses: actions/checkout@v2.3.4
 
-      - uses: actions/setup-java@v1.4.3
-        with:
-          java-version: 8
-
       - uses: actions/cache@v1
         with:
           path: ~/.m2/repository
           key:          maven-site-test-${{ hashFiles('**/pom.xml') }}
           restore-keys: maven-site-test-
 
+      - uses: actions/setup-java@v1.4.3
+        with:
+          java-version: 8
+
       - uses: s4u/maven-settings-action@v2.2.0
         with:
           sonatypeSnapshots: true
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index e0059b8..7737902 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -57,16 +57,12 @@ jobs:
 
       - uses: actions/cache@v2.1.3
         with:
-          path: ~/.m2/repository
+          path: |
+            ~/.m2/repository
+            ~/.sonar/cache
           key: ubuntu-latest-jdk11-${{ hashFiles('**/pom.xml') }}
           restore-keys: ubuntu-latest-jdk11-
 
-      - uses: actions/cache@v2.1.3
-        with:
-          path: ~/.sonar/cache
-          key: sonar-cache
-          restore-keys: sonar-cache
-
       - uses: actions/setup-java@v1.4.3
         with:
           java-version: 11