diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index cec81e2..bf09b04 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -16,8 +16,6 @@ jobs:
             ~/.cargo/registry
             ~/.cargo/git
             target
-          key: cargo-${{ runner.os }}-${{ hashFiles('**/Cargo.toml') }}
-          restore-keys: |
-            cargo-${{ runner.os }}-
+          key: cargo-${{ runner.os }}-${{ hashFiles('**/Cargo.toml') }}-cli
       - name: Build
         run: cargo build -p svg2gcode-cli
diff --git a/.github/workflows/lib.yml b/.github/workflows/lib.yml
index 21d18f9..80fe59b 100644
--- a/.github/workflows/lib.yml
+++ b/.github/workflows/lib.yml
@@ -35,9 +35,7 @@ jobs:
             ~/.cargo/registry
             ~/.cargo/git
             target
-          key: cargo-${{ runner.os }}-${{ hashFiles('**/Cargo.toml') }}
-          restore-keys: |
-            cargo-${{ runner.os }}-
+          key: cargo-${{ runner.os }}-${{ hashFiles('**/Cargo.toml') }}-lib
       - uses: actions-rs/cargo@v1
         with:
           command: build
diff --git a/.github/workflows/web-deploy.yml b/.github/workflows/web-deploy.yml
index 4ae3046..40d13b2 100644
--- a/.github/workflows/web-deploy.yml
+++ b/.github/workflows/web-deploy.yml
@@ -26,9 +26,7 @@ jobs:
             ~/.cargo/registry
             ~/.cargo/git
             target
-          key: cargo-${{ runner.os }}-${{ hashFiles('**/Cargo.toml') }}
-          restore-keys: |
-            cargo-${{ runner.os }}-
+          key: cargo-${{ runner.os }}-${{ hashFiles('**/Cargo.toml') }}-web-deploy
 
       - uses: jetli/trunk-action@v0.1.0  
       - uses: jetli/wasm-bindgen-action@v0.1.0
diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
index 3e19ebb..9648564 100644
--- a/.github/workflows/web.yml
+++ b/.github/workflows/web.yml
@@ -14,8 +14,6 @@ jobs:
             ~/.cargo/registry
             ~/.cargo/git
             target
-          key: cargo-${{ runner.os }}-${{ hashFiles('**/Cargo.toml') }}
-          restore-keys: |
-            cargo-${{ runner.os }}-
+          key: cargo-${{ runner.os }}-${{ hashFiles('**/Cargo.toml') }}-web
       - name: Build
         run: cargo build -p svg2gcode-web