diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 3238e11e9..60facf916 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -33,12 +33,24 @@ jobs:
         id: vars
         run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITEA_OUTPUT
 
+      - name: Get toolchain hash
+        id: toolchain-hash
+        run: |
+          a=$(find ${{ gitea.workspace }}/programs/develop/cmm/ -type f - print0 | sort -z | xargs -0 sha1sum)
+          b=$(sha1sum ${{ gitea.workspace }}/programs/develop/ktcc/trunk/bin/kos32-tcc)
+          c=$(find ${{ gitea.workspace }}/programs/develop/objconv/ -type f -print0 | sort -z | xargs -0 sha1sum)
+          d=$(find ${{ gitea.workspace }}/programs/other/kpack/kerpack_linux/ -type f -print0 | sort -z | xargs -0 sha1sum)
+          e=$(find ${{ gitea.workspace }}/programs/other/kpack/linux/ -type f -print0 | sort -z | xargs -0 sha1sum)
+          f=$(find ${{ gitea.workspace }}/programs/develop/clink/ -type f -print0 | sort -z | xargs -0 sha1sum)
+          echo $a $b $c $d $e $f
+          echo hash=$(echo $a $b $c $d $e $f | sha1sum | awk '{print $1}')" >> $GITEA_OUTPUT
+
       - name: Restore toolchain
         id: cache-toolchain
         uses: actions/cache/restore@v4
         with:
           path: /home/autobuild
-          key: kolibri-toolchain
+          key: kolibri-toolchain-${{ steps.toolchain-hash.outputs.hash }}
 
       - name: Build and install C--
         if: steps.cache-toolchain.outputs.cache-hit != 'true'
@@ -98,7 +110,7 @@ jobs:
         uses: actions/cache/save@v4
         with:
           path: /home/autobuild
-          key: kolibri-toolchain
+          key: kolibri-toolchain-${{ steps.toolchain-hash.outputs.hash }}
 
       - name: Configure tup
         run: |