diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 6495386..09f7b82 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -18,6 +18,8 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: '9.4.1'
+          cache-read-only: false
+          cache-cleanup: on-success
       - name: Build
         run: gradle build -x test --no-daemon
         env:
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 98c576a..5fe1c35 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -23,6 +23,8 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: '9.4.1'
+          cache-read-only: ${{ github.event_name == 'pull_request' }}
+          cache-cleanup: on-success
       - name: Build
         run: gradle build -x test --no-daemon
         env:
diff --git a/.github/workflows/test-gradle.yml b/.github/workflows/test-gradle.yml
index 880c7e0..39c6991 100644
--- a/.github/workflows/test-gradle.yml
+++ b/.github/workflows/test-gradle.yml
@@ -2,32 +2,6 @@ on:
   push:
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    env:
-      JAVA_TOOL_OPTIONS: -Djavax.net.ssl.trustStoreType=JKS -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts -Djavax.net.ssl.trustStorePassword=changeit
-
-    steps:
-      - uses: actions/checkout@v5
-      - name: Set up JDK 21
-        uses: actions/setup-java@v5
-        with:
-          java-version: '21'
-          distribution: 'zulu'
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          gradle-version: '9.4.1'
-      - name: Build
-        run: gradle build -x test --no-daemon
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Upload AntiVPN
-        uses: actions/upload-artifact@v4
-        with:
-          name: AntiVPN-Universal
-          path: build/libs/AntiVPN-*-universal.jar
-
   build-and-test:
     runs-on: ubuntu-latest
     env:
@@ -44,7 +18,16 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: '9.4.1'
-      - name: Build and Test
-        run: gradle build --no-daemon
+          cache-read-only: ${{ github.event_name == 'pull_request' }}
+          cache-cleanup: on-success
+      - name: Build
+        run: gradle build -x test --no-daemon
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload AntiVPN
+        uses: actions/upload-artifact@v4
+        with:
+          name: AntiVPN-Universal
+          path: build/libs/AntiVPN-*-universal.jar
+      - name: Test
+        run: gradle test --no-daemon
diff --git a/gradle.properties b/gradle.properties
index e69de29..5f1ed7b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -0,0 +1 @@
+org.gradle.caching=true
\ No newline at end of file