diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml
index 62a6ac86..9d8f6391 100644
--- a/.github/workflows/stack.yml
+++ b/.github/workflows/stack.yml
@@ -60,14 +60,22 @@ jobs:
           sudo apt install -y ghc-${{ matrix.ghc }}
           echo /opt/ghc/${{ matrix.ghc }}/bin >> $GITHUB_PATH
 
+      - name: Cache Haskell package metadata
+        uses: actions/cache@v2
+        with:
+          path: ~/.stack/pantry
+          key: stack-pantry-${{ runner.os }}
+
       - name: Cache Haskell dependencies
         uses: actions/cache@v2
         with:
-          path: ~/.stack
-          key: ${{ runner.os }}-${{ matrix.resolver }}-${{ hashFiles(matrix.yaml) }}-${{ hashFiles('*.cabal') }}
+          path: |
+            ~/.stack/*
+            !~/.stack/pantry
+          key: stack-${{ runner.os }}-${{ matrix.resolver }}-${{ hashFiles(matrix.yaml) }}-${{ hashFiles('*.cabal') }}
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.resolver }}-${{ hashFiles(matrix.yaml) }}-
-            ${{ runner.os }}-${{ matrix.resolver }}-
+            stack-${{ runner.os }}-${{ matrix.resolver }}-${{ hashFiles(matrix.yaml) }}-
+            stack-${{ runner.os }}-${{ matrix.resolver }}-
 
       - name: Build and test
         run: |