diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index bad785a1fc7c..9e24ecfc42dc 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -84,14 +84,14 @@ jobs:
       - name: Restore eslint cache
         uses: actions/cache@v4
         with:
-          path: node_modules/.cache/eslint
-          key: eslint-${{ env.eslint-cache-version }}-${{ hashFiles('/pnpm-lock.yaml') }}-${{ github.ref_name }}-${{ github.sha }}
+          path: ${{ github.workspace }}/node_modules/.cache/eslint-${{ matrix.workspace }}
+          key: eslint-${{ env.eslint-cache-version }}-${{ matrix.workspace }}-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ github.ref_name }}-${{ github.sha }}
           restore-keys: |
-            eslint-${{ env.eslint-cache-version }}-${{ hashFiles('/pnpm-lock.yaml') }}-
+            eslint-${{ env.eslint-cache-version }}-${{ matrix.workspace }}-${{ hashFiles('**/pnpm-lock.yaml') }}-
 
       - name: Run eslint
         run: |
-          pnpm --filter ${{ matrix.workspace }} run eslint --cache --cache-location node_modules/.cache/eslint --cache-strategy content
+          pnpm --filter ${{ matrix.workspace }} run eslint --cache --cache-location node_modules/.cache/eslint-${{ matrix.workspace }} --cache-strategy content
 
   typecheck:
     name: Typecheck