diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index f9e239d263..b75bd9bc89 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -68,16 +68,12 @@ jobs:
           export PATH="$HOME/.pixi/bin:$PATH"
           pixi --version
 
-      - name: Compute cache date key
-        id: cache-date
-        run: echo "date=$(date -u +%Y%m%d)" >> $GITHUB_OUTPUT
-
       - name: Restore ccache
         id: ccache-restore
         uses: https://git.kindred-systems.com/actions/cache.git/restore@v4
         with:
           path: /tmp/ccache-kindred-create
-          key: ccache-build-${{ github.ref_name }}-${{ steps.cache-date.outputs.date }}
+          key: ccache-build-${{ github.ref_name }}-${{ github.run_id }}
           restore-keys: |
             ccache-build-${{ github.ref_name }}-
             ccache-build-main-
@@ -98,11 +94,11 @@ jobs:
         run: pixi run ccache -s
 
       - name: Save ccache
-        if: always() && steps.ccache-restore.outputs.cache-hit != 'true'
+        if: always()
         uses: https://git.kindred-systems.com/actions/cache.git/save@v4
         with:
           path: /tmp/ccache-kindred-create
-          key: ccache-build-${{ github.ref_name }}-${{ steps.cache-date.outputs.date }}
+          key: ccache-build-${{ github.ref_name }}-${{ github.run_id }}
 
       - name: Run C++ unit tests
         continue-on-error: true
diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index cea4cd4c16..d149142ff6 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -78,18 +78,15 @@ jobs:
           export PATH="$HOME/.pixi/bin:$PATH"
           pixi --version
 
-      - name: Compute cache date key
-        id: cache-date
-        run: echo "date=$(date -u +%Y%m%d)" >> $GITHUB_OUTPUT
-
       - name: Restore ccache
         id: ccache-restore
         uses: https://git.kindred-systems.com/actions/cache.git/restore@v4
         with:
           path: /tmp/ccache-kindred-create
-          key: ccache-release-linux-${{ steps.cache-date.outputs.date }}
+          key: ccache-release-linux-${{ github.run_id }}
           restore-keys: |
             ccache-release-linux-
+            ccache-build-main-
 
       - name: Prepare ccache
         run: |
@@ -109,11 +106,11 @@ jobs:
         run: pixi run ccache -s
 
       - name: Save ccache
-        if: always() && steps.ccache-restore.outputs.cache-hit != 'true'
+        if: always()
         uses: https://git.kindred-systems.com/actions/cache.git/save@v4
         with:
           path: /tmp/ccache-kindred-create
-          key: ccache-release-linux-${{ steps.cache-date.outputs.date }}
+          key: ccache-release-linux-${{ github.run_id }}
 
       - name: Clean up intermediate build files
         run: |