diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1a7bcea..3718562 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,23 +9,19 @@ jobs:
     name: "Build"
     runs-on: "ubuntu-latest"
     steps:
-    - uses: "actions/checkout@v4"
-    - uses: "actions/setup-java@v4"
+    - uses: "actions/checkout@master"
+    - uses: "actions/setup-java@master"
       with:
         distribution: "adopt"
         java-version: "11"
-    - uses: "actions/cache@v4"
+    - uses: "actions/cache@master"
       with:
-        path: "~/.gradle/caches"
-        key: "${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle.kts') }}"
+        path: |
+          ~/.gradle/caches
+          ~/.gradle/wrapper
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
         restore-keys: |
           ${{ runner.os }}-gradle-
-    - uses: "actions/cache@v4"
-      with:
-        path: "~/.gradle/wrapper"
-        key: "${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle-wrapper.properties') }}"
-        restore-keys: |
-          ${{ runner.os }}-gradlew-
     - run: |
         chmod +x gradlew
         ./gradlew build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0e5a0f7..70f119e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,23 +9,19 @@ jobs:
     name: "Release"
     runs-on: "ubuntu-latest"
     steps:
-    - uses: "actions/checkout@v4"
-    - uses: "actions/setup-java@v4"
+    - uses: "actions/checkout@master"
+    - uses: "actions/setup-java@master"
       with:
         distribution: "adopt"
         java-version: "11"
-    - uses: "actions/cache@v4"
+    - uses: "actions/cache@master"
       with:
-        path: "~/.gradle/caches"
-        key: "${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle.kts') }}"
+        path: |
+          ~/.gradle/caches
+          ~/.gradle/wrapper
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
         restore-keys: |
           ${{ runner.os }}-gradle-
-    - uses: "actions/cache@v4"
-      with:
-        path: "~/.gradle/wrapper"
-        key: "${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle-wrapper.properties') }}"
-        restore-keys: |
-          ${{ runner.os }}-gradlew-
     - run: |
         [[ "${{ github.event.release.tag_name }}" =~ ^[0-9]+(\.[0-9]+)*$ ]] || exit -1
         chmod +x gradlew