diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 8c57104..7308aa2 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -105,11 +105,11 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{github.workspace}}/.scons_cache/
-          key: ${{matrix.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
+          key: ${{env.BIN}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}-${{env.LIMBOAI_VERSION}}
           restore-keys: |
-            ${{env.BIN}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
-            ${{env.BIN}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
-            ${{env.BIN}}-${{env.GODOT_BASE_BRANCH}}
+            ${{env.BIN}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}-${{env.LIMBOAI_VERSION}}
+            ${{env.BIN}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}
+            ${{env.BIN}}-${{inputs.godot-treeish}}
 
       - name: Compilation
         env:
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 4db9047..1adcc06 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -117,11 +117,11 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{github.workspace}}/.scons_cache/
-          key: ${{matrix.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
+          key: ${{env.BIN}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}-${{env.LIMBOAI_VERSION}}
           restore-keys: |
-            ${{env.BIN}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
-            ${{env.BIN}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
-            ${{env.BIN}}-${{env.GODOT_BASE_BRANCH}}
+            ${{env.BIN}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}-${{env.LIMBOAI_VERSION}}
+            ${{env.BIN}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}
+            ${{env.BIN}}-${{inputs.godot-treeish}}
 
       - name: Compilation
         env:
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 9a604f7..bbb4e43 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -142,11 +142,11 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{github.workspace}}/.scons_cache/
-          key: ${{matrix.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
+          key: ${{env.BIN}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}-${{env.LIMBOAI_VERSION}}
           restore-keys: |
-            ${{env.BIN}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
-            ${{env.BIN}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
-            ${{env.BIN}}-${{env.GODOT_BASE_BRANCH}}
+            ${{env.BIN}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}-${{env.LIMBOAI_VERSION}}
+            ${{env.BIN}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}
+            ${{env.BIN}}-${{inputs.godot-treeish}}
 
       - name: Compilation
         env:
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 2651bd7..aacdd92 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -160,11 +160,11 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{github.workspace}}/.scons_cache/
-          key: ${{matrix.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
+          key: ${{env.BIN}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}-${{env.LIMBOAI_VERSION}}
           restore-keys: |
-            ${{env.BIN}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
-            ${{env.BIN}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
-            ${{env.BIN}}-${{env.GODOT_BASE_BRANCH}}
+            ${{env.BIN}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}-${{env.LIMBOAI_VERSION}}
+            ${{env.BIN}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}
+            ${{env.BIN}}-${{inputs.godot-treeish}}
 
       - name: Compilation
         env:
diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
index 38cae0c..829ef6f 100644
--- a/.github/workflows/web.yml
+++ b/.github/workflows/web.yml
@@ -94,11 +94,11 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{github.workspace}}/.scons_cache/
-          key: ${{matrix.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
+          key: ${{env.CACHE_NAME}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}-${{env.LIMBOAI_VERSION}}
           restore-keys: |
-            ${{env.CACHE_NAME}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
-            ${{env.CACHE_NAME}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
-            ${{env.CACHE_NAME}}-${{env.GODOT_BASE_BRANCH}}
+            ${{env.CACHE_NAME}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}-${{env.LIMBOAI_VERSION}}
+            ${{env.CACHE_NAME}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}
+            ${{env.CACHE_NAME}}-${{inputs.godot-treeish}}
 
       - name: Compilation
         env:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index db4f9d3..d3aeb07 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -137,11 +137,11 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{github.workspace}}/.scons_cache/
-          key: ${{matrix.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
+          key: ${{env.BIN}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}-${{env.LIMBOAI_VERSION}}
           restore-keys: |
-            ${{env.BIN}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
-            ${{env.BIN}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
-            ${{env.BIN}}-${{env.GODOT_BASE_BRANCH}}
+            ${{env.BIN}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}-${{env.LIMBOAI_VERSION}}
+            ${{env.BIN}}-${{inputs.godot-treeish}}-${{inputs.limboai-treeish}}
+            ${{env.BIN}}-${{inputs.godot-treeish}}
 
       - name: Compilation
         env: