diff --git a/.github/composite-actions/restore-cache/action.yml b/.github/composite-actions/restore-cache/action.yml
index 82dc79d..c0dda0b 100644
--- a/.github/composite-actions/restore-cache/action.yml
+++ b/.github/composite-actions/restore-cache/action.yml
@@ -17,8 +17,6 @@ runs:
       with:
         path: .turbo
         key: ${{ inputs.turbo-cache-key }}
-        restore-keys: |
-          ${{ runner.os }}-turbo-
 
     - name: Restore node_modules cache
       uses: actions/cache@v4
@@ -27,8 +25,6 @@ runs:
           node_modules
           */node_modules
         key: ${{ inputs.node-modules-cache-key }}
-        restore-keys: |
-          ${{ runner.os }}-node-modules-
 
     - name: Setup Node.js
       uses: actions/setup-node@v4
diff --git a/.github/composite-actions/setup-node-pnpm/action.yml b/.github/composite-actions/setup-node-pnpm/action.yml
index 1f9e290..a15669c 100644
--- a/.github/composite-actions/setup-node-pnpm/action.yml
+++ b/.github/composite-actions/setup-node-pnpm/action.yml
@@ -12,16 +12,24 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Restore node_modules cache
-      id: node-modules-cache
+    - name: Check if node_modules cache exists
+      id: check-node-modules-cache
+      uses: actions/cache@v4
+      with:
+        path: |
+          node_modules
+          */node_modules
+        key: ${{ inputs.node-modules-cache-key }}
+        lookup-only: true
+
+    - name: Restore node_modules cache
+      if: steps.check-node-modules-cache.outputs.cache-hit != 'true'
       uses: actions/cache@v4
       with:
         path: |
           node_modules
           */node_modules
         key: ${{ inputs.node-modules-cache-key }}
-        restore-keys: |
-          ${{ runner.os }}-node-modules-
 
     - name: Setup Node.js
       uses: actions/setup-node@v4
@@ -29,12 +37,13 @@ runs:
         node-version: lts/*
 
     - name: Setup pnpm
+      if: steps.check-node-modules-cache.outputs.cache-hit != 'true'
       uses: pnpm/action-setup@v4
       with:
         version: 10.11.0
         run_install: false
 
     - name: Install dependencies
-      if: steps.node-modules-cache.outputs.cache-hit != 'true'
+      if: steps.check-node-modules-cache.outputs.cache-hit != 'true'
       shell: bash
       run: pnpm install --frozen-lockfile