diff --git a/.github/workflows/docker-test-ubuntu.yml b/.github/workflows/docker-test-ubuntu.yml
index ad666f06d..2059fa029 100644
--- a/.github/workflows/docker-test-ubuntu.yml
+++ b/.github/workflows/docker-test-ubuntu.yml
@@ -30,4 +30,4 @@ jobs:
           cache-from: |
             type=gha,scope=${{ github.ref_name }}
             type=gha,scope=main
-          cache-to: type=gha,mode=max,scope=${{ github.ref_name }}
+          cache-to: type=gha,mode=min,scope=${{ github.ref_name }}
diff --git a/.github/workflows/linux-arm.yml b/.github/workflows/linux-arm.yml
index f0ac262a3..b1f8bd3cd 100644
--- a/.github/workflows/linux-arm.yml
+++ b/.github/workflows/linux-arm.yml
@@ -10,7 +10,6 @@ on:
 env:
   DEBIAN_FRONTEND: noninteractive
   OPENCV_VERSION: 4.13.0
-  OPENCV_CACHE_VERSION: 1
 
 jobs:
   build:
@@ -54,7 +53,9 @@ jobs:
         uses: actions/cache/restore@v5
         with:
           path: ${{ github.workspace }}/opencv_artifacts/
-          key: opencv-arm-${{ env.OPENCV_VERSION }}-rev${{ env.OPENCV_CACHE_VERSION }}
+          key: opencv-arm-${{ env.OPENCV_VERSION }}-${{ hashFiles('.github/workflows/linux-arm.yml') }}
+          restore-keys: |
+            opencv-arm-${{ env.OPENCV_VERSION }}-
 
       - name: Checkout OpenCV
         if: steps.opencv-cache.outputs.cache-hit != 'true'
@@ -125,7 +126,7 @@ jobs:
         uses: actions/cache/save@v5
         with:
           path: ${{ github.workspace }}/opencv_artifacts/
-          key: opencv-arm-${{ env.OPENCV_VERSION }}-rev${{ env.OPENCV_CACHE_VERSION }}
+          key: opencv-arm-${{ env.OPENCV_VERSION }}
       
       - name: Build OpenCvSharpExtern
         run: |
diff --git a/.github/workflows/ubuntu-slim.yml b/.github/workflows/ubuntu-slim.yml
index 638869551..f9be6795e 100644
--- a/.github/workflows/ubuntu-slim.yml
+++ b/.github/workflows/ubuntu-slim.yml
@@ -10,7 +10,6 @@ on:
 env:
   DEBIAN_FRONTEND: noninteractive
   OPENCV_VERSION: 4.13.0
-  OPENCV_CACHE_VERSION: 1
 
 jobs:
   build_test:
@@ -50,8 +49,10 @@ jobs:
         id: opencv-cache
         uses: actions/cache/restore@v5
         with:
-          path: ${{ github.workspace }}/opencv_artifacts_slim/
-          key: opencv-${{ env.OPENCV_VERSION }}-ubuntu-${{ matrix.ubuntu }}-slim-rev${{ env.OPENCV_CACHE_VERSION }}
+          path: |
+            ${{ github.workspace }}/opencv_artifacts_slim/include
+            ${{ github.workspace }}/opencv_artifacts_slim/lib
+          key: opencv-${{ env.OPENCV_VERSION }}-ubuntu-${{ matrix.ubuntu }}-slim
 
       - name: Checkout OpenCV
         if: steps.opencv-cache.outputs.cache-hit != 'true'
@@ -131,8 +132,10 @@ jobs:
         if: steps.opencv-cache.outputs.cache-hit != 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main'
         uses: actions/cache/save@v5
         with:
-          path: ${{ github.workspace }}/opencv_artifacts_slim/
-          key: opencv-${{ env.OPENCV_VERSION }}-ubuntu-${{ matrix.ubuntu }}-slim-rev${{ env.OPENCV_CACHE_VERSION }}
+          path: |
+            ${{ github.workspace }}/opencv_artifacts_slim/include
+            ${{ github.workspace }}/opencv_artifacts_slim/lib
+          key: opencv-${{ env.OPENCV_VERSION }}-ubuntu-${{ matrix.ubuntu }}-slim
 
       - name: Build OpenCvSharpExtern (slim)
         run: |
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index f367faaf7..f405ed7fa 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -10,7 +10,6 @@ on:
 env:
   DEBIAN_FRONTEND: noninteractive
   OPENCV_VERSION: 4.13.0
-  OPENCV_CACHE_VERSION: 2
 
 jobs:
   build_test:
@@ -61,8 +60,10 @@ jobs:
         id: opencv-cache
         uses: actions/cache/restore@v5
         with:
-          path: ${{ github.workspace }}/opencv_artifacts/
-          key: opencv-${{ env.OPENCV_VERSION }}-ubuntu-${{ matrix.ubuntu }}-rev${{ env.OPENCV_CACHE_VERSION }}
+          path: |
+            ${{ github.workspace }}/opencv_artifacts/include
+            ${{ github.workspace }}/opencv_artifacts/lib
+          key: opencv-${{ env.OPENCV_VERSION }}-ubuntu-${{ matrix.ubuntu }}
 
       - name: Checkout OpenCV
         if: steps.opencv-cache.outputs.cache-hit != 'true'
@@ -132,8 +133,10 @@ jobs:
         if: steps.opencv-cache.outputs.cache-hit != 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main'
         uses: actions/cache/save@v5
         with:
-          path: ${{ github.workspace }}/opencv_artifacts/
-          key: opencv-${{ env.OPENCV_VERSION }}-ubuntu-${{ matrix.ubuntu }}-rev${{ env.OPENCV_CACHE_VERSION }}
+          path: |
+            ${{ github.workspace }}/opencv_artifacts/include
+            ${{ github.workspace }}/opencv_artifacts/lib
+          key: opencv-${{ env.OPENCV_VERSION }}-ubuntu-${{ matrix.ubuntu }}
       
       - name: Build OpenCvSharpExtern
         run: |
diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
index 4905a599b..25c0292ec 100644
--- a/.github/workflows/wasm.yml
+++ b/.github/workflows/wasm.yml
@@ -10,7 +10,6 @@ on:
 env:
   DEBIAN_FRONTEND: noninteractive
   OPENCV_VERSION: 4.13.0
-  OPENCV_CACHE_VERSION: 1
   EM_VERSION: 4.0.23
   EM_CACHE_FOLDER: 'emsdk-cache'
 
@@ -59,7 +58,7 @@ jobs:
         uses: actions/cache/restore@v5
         with:
           path: ${{ github.workspace }}/opencv_wasm/
-          key: opencv-${{ env.OPENCV_VERSION }}-wasm-${{ env.EM_VERSION }}-rev${{ env.OPENCV_CACHE_VERSION }}
+          key: opencv-${{ env.OPENCV_VERSION }}-wasm-${{ env.EM_VERSION }}
 
       - name: Setup Emscripten cache
         id: cache-system-libraries
@@ -140,7 +139,7 @@ jobs:
         uses: actions/cache/save@v5
         with:
           path: ${{ github.workspace }}/opencv_wasm/
-          key: opencv-${{ env.OPENCV_VERSION }}-wasm-${{ env.EM_VERSION }}-rev${{ env.OPENCV_CACHE_VERSION }}
+          key: opencv-${{ env.OPENCV_VERSION }}-wasm-${{ env.EM_VERSION }}
       
       - name: Build OpenCvSharpExtern
         run: |