diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7ace420..ed993be 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,14 +48,23 @@ jobs:
           echo "EOF"
         } >> $GITHUB_OUTPUT
 
-    - name: Setup Tools Cache
-      id: tools-cache
+    - name: Cache CMake Binary
+      id: cmake-cache
+      uses: actions/cache@v4
+      with:
+        path: cmake-4.3.4-linux-x86_64
+        key: ${{ runner.os }}-cmake-4.3.4
+        
+    - name: Cache FetchContent & ccache
       uses: actions/cache@v4
       with:
         path: |
-          cmake-4.3.4-linux-x86_64
+          build/_deps
           ccache
-        key: ${{ runner.os }}-tools-${{ hashFiles('**/CMakeLists.txt') }}
+        key: ${{ runner.os }}-deps-${{ hashFiles('**/CMakeLists.txt') }}-${{ github.sha }}
+        restore-keys: |
+          ${{ runner.os }}-deps-${{ hashFiles('**/CMakeLists.txt') }}-
+          ${{ runner.os }}-deps-
 
     - name: Install tools
       run: |