diff --git a/.github/actions/setup-nix/action.yaml b/.github/actions/setup-nix/action.yaml
index c8de447d33..779b324e06 100644
--- a/.github/actions/setup-nix/action.yaml
+++ b/.github/actions/setup-nix/action.yaml
@@ -20,11 +20,9 @@ runs:
     - name: Restore and cache Nix store
       uses: nix-community/cache-nix-action@v4.0.3
       with:
-        key: cache-nix-${{ runner.os }}-id-${{ inputs.cache-id }}-${{ hashFiles('nix/**/*.nix', '.github/actions/setup-nix/*') }}
+        key: cache-nix-${{ runner.os }}-${{ inputs.cache }}-${{ hashFiles('**/*.nix', 'nix/**/*.patch') }}
         restore-keys: |
-          cache-nix-${{ runner.os }}-id-${{ inputs.cache-id }}-
-          cache-nix-${{ runner.os }}-id-common-
-          cache-nix-${{ runner.os }}-
+          cache-nix-${{ runner.os }}-${{ inputs.cache }}-
     - uses: cachix/cachix-action@v14
       with:
         name: postgrest
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 84ad16b9d3..d2bb20cad4 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -273,7 +273,7 @@ jobs:
             ~/.cabal/packages
             ~/.cabal/store
             dist-newstyle
-          key: cache-cabal-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('**/*.cabal', '**/cabal.project') }}
+          key: cache-cabal-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('postgrest.cabal', 'cabal.project', 'cabal.project.freeze') }}
           restore-keys: |
             cache-cabal-${{ runner.os }}-${{ matrix.ghc }}-
       - name: Install dependencies