diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 86160d15..7fc87cd2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,6 +30,7 @@ jobs:
         with:
           channel: "stable"
           cache: true
+          pub-cache: false
 
       - name: Cache Pub dependencies
         uses: actions/cache@v4
@@ -139,6 +140,7 @@ jobs:
         with:
           channel: "stable"
           cache: true
+          pub-cache: false
 
       - name: Cache Pub dependencies
         uses: actions/cache@v4
@@ -229,6 +231,7 @@ jobs:
         with:
           channel: "stable"
           cache: true
+          pub-cache: false
 
       - name: Cache Pub dependencies
         uses: actions/cache@v4
@@ -423,6 +426,7 @@ jobs:
         with:
           channel: "stable"
           cache: true
+          pub-cache: false
 
       - name: Cache Pub dependencies
         uses: actions/cache@v4
@@ -433,6 +437,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pub-
 
+      - name: Cache Windows native dependencies
+        uses: actions/cache@v4
+        with:
+          path: build/windows/x64/_deps
+          key: windows-native-x64-${{ hashFiles('windows/CMakeLists.txt') }}
+
       - name: Install dependencies
         run: flutter pub get
 
@@ -492,7 +502,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Cache Windows native dependencies
+        id: windows-native-cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            build/windows/arm64/_deps
+            build/windows/arm64/mpv-dev-arm64
+          key: windows-native-arm64-${{ hashFiles('windows/CMakeLists.txt') }}
+
       - name: Install 7-Zip
+        if: steps.windows-native-cache.outputs.cache-hit != 'true'
         run: choco install 7zip -y
 
       - name: Setup Flutter
@@ -500,6 +520,7 @@ jobs:
         with:
           channel: "master"
           cache: true
+          pub-cache: false
 
       - name: Cache Pub dependencies
         uses: actions/cache@v4
@@ -659,6 +680,7 @@ jobs:
         with:
           channel: "stable"
           cache: true
+          pub-cache: false
 
       - name: Cache Pub dependencies
         uses: actions/cache@v4
@@ -799,6 +821,7 @@ jobs:
         with:
           channel: "master"
           cache: true
+          pub-cache: false
 
       - name: Cache Pub dependencies
         uses: actions/cache@v4
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 297460aa..1f784e11 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,6 +24,7 @@ jobs:
         with:
           channel: "stable"
           cache: true
+          pub-cache: false
 
       - name: Cache Pub dependencies
         uses: actions/cache@v4
@@ -107,6 +108,7 @@ jobs:
         with:
           channel: "stable"
           cache: true
+          pub-cache: false
 
       - name: Cache Pub dependencies
         uses: actions/cache@v4
@@ -162,6 +164,7 @@ jobs:
         with:
           channel: "stable"
           cache: true
+          pub-cache: false
 
       - name: Cache Pub dependencies
         uses: actions/cache@v4