diff --git a/.github/workflows/Java.yml b/.github/workflows/Java.yml
index b27b9aee5..39815d2ac 100644
--- a/.github/workflows/Java.yml
+++ b/.github/workflows/Java.yml
@@ -56,6 +56,12 @@ jobs:
         with:
           docker_image: '${{ env.MANYLINUX_IMAGE }}'
 
+      - name: Save Cache
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ github.workspace }}/ccache
+          key: ${{ steps.cache_key.outputs.value }} 
+
       - name: List Symbols
         run: |
           nm -gU ./build/release/libduckdb_java.so_linux_amd64
@@ -88,12 +94,6 @@ jobs:
           path: |
             build/release/duckdb_jdbc.jar
 
-      - name: Save Cache
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ github.workspace }}/ccache
-          key: ${{ steps.cache_key.outputs.value }} 
-
   java-linux-amd64-tck:
     name: Linux TCK (amd64)
     runs-on: ubuntu-latest
@@ -274,6 +274,12 @@ jobs:
         with:
           docker_image: '${{ env.MANYLINUX_IMAGE }}'
 
+      - name: Save Cache
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ github.workspace }}/ccache
+          key: ${{ steps.cache_key.outputs.value }} 
+
       - name: List Symbols
         run: |
           nm -gU ./build/release/libduckdb_java.so_linux_arm64
@@ -300,12 +306,6 @@ jobs:
           path: |
             build/release/duckdb_jdbc.jar
 
-      - name: Save Cache
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ github.workspace }}/ccache
-          key: ${{ steps.cache_key.outputs.value }} 
-
   java-linux-amd64-musl:
     name: Linux (amd64-musl)
     runs-on: ubuntu-latest
@@ -335,6 +335,12 @@ jobs:
         with:
           docker_image: '${{ env.ALPINE_IMAGE }}'
 
+      - name: Save Cache
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ github.workspace }}/ccache
+          key: ${{ steps.cache_key.outputs.value }} 
+
       - name: List Symbols
         run: |
           nm -gU ./build/release/libduckdb_java.so_linux_amd64
@@ -357,12 +363,6 @@ jobs:
           path: |
             build/release/duckdb_jdbc.jar
 
-      - name: Save Cache
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ github.workspace }}/ccache
-          key: ${{ steps.cache_key.outputs.value }} 
-
   java-linux-aarch64-musl:
     name: Linux (aarch64-musl)
     runs-on: ubuntu-24.04-arm
@@ -392,6 +392,12 @@ jobs:
         with:
           docker_image: '${{ env.ALPINE_IMAGE }}'
 
+      - name: Save Cache
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ github.workspace }}/ccache
+          key: ${{ steps.cache_key.outputs.value }} 
+
       - name: List Symbols
         run: |
           nm -gU ./build/release/libduckdb_java.so_linux_arm64
@@ -414,12 +420,6 @@ jobs:
           path: |
             build/release/duckdb_jdbc.jar
 
-      - name: Save Cache
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ github.workspace }}/ccache
-          key: ${{ steps.cache_key.outputs.value }} 
-
   java-windows-amd64:
     name: Windows (amd64)
     runs-on: windows-latest
@@ -434,6 +434,13 @@ jobs:
           fetch-depth: 0
           ref: ${{ inputs.git_ref }}
 
+      - name: Dependencies
+        shell: bash
+        run: |
+          choco install \
+            ccache \
+            -y --force --no-progress
+
       - name: Cache Key
         id: cache_key
         shell: bash
@@ -459,6 +466,12 @@ jobs:
           cmake ../.. -G Ninja -DCMAKE_BUILD_TYPE=Release
           cmake --build . --config Release
 
+      - name: Save Cache
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ github.workspace }}/ccache
+          key: ${{ steps.cache_key.outputs.value }} 
+
       - name: List Symbols
         shell: cmd
         run: |
@@ -485,12 +498,6 @@ jobs:
           path: |
             build/release/duckdb_jdbc.jar
 
-      - name: Save Cache
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ github.workspace }}/ccache
-          key: ${{ steps.cache_key.outputs.value }} 
-
   java-windows-aarch64:
     name: Windows (aarch64)
     runs-on: windows-11-arm
@@ -541,6 +548,12 @@ jobs:
           cmake ../.. -G Ninja -DCMAKE_BUILD_TYPE=Release
           cmake --build . --config Release
 
+      - name: Save Cache
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ github.workspace }}/ccache
+          key: ${{ steps.cache_key.outputs.value }} 
+
       - name: List Symbols
         shell: cmd
         run: |
@@ -567,12 +580,6 @@ jobs:
           path: |
             build/release/duckdb_jdbc.jar
 
-      - name: Save Cache
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ github.workspace }}/ccache
-          key: ${{ steps.cache_key.outputs.value }} 
-
   java-osx-universal:
     name: macOS (Universal)
     runs-on: macos-latest
@@ -614,6 +621,12 @@ jobs:
         shell: bash
         run: make release
 
+      - name: Save Cache
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ github.workspace }}/ccache
+          key: ${{ steps.cache_key.outputs.value }} 
+
       - name: List Symbols
         run: |
           nm -gU ./build/release/libduckdb_java.so_osx_universal
@@ -639,12 +652,6 @@ jobs:
           path: |
             build/release/duckdb_jdbc.jar
 
-      - name: Save Cache
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ github.workspace }}/ccache
-          key: ${{ steps.cache_key.outputs.value }} 
-
   maven-deploy:
     if: ${{ github.repository == 'duckdb/duckdb-java' && inputs.override_git_describe == '' && startsWith(github.ref, 'refs/tags/') }}
     name: Maven Deploy