diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 4aed5ecb..19cacfdc 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -44,11 +44,10 @@ jobs:
       - run: nix-instantiate shell.nix | cachix push samirtalwar
         env:
           CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
-      - uses: actions/cache@v2
-        with:
-          path: ~/.stack
-          key: v1-${{ matrix.os }}-stack-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}
-          restore-keys: v1-${{ matrix.os }}-stack-
+      # - uses: actions/cache@v2
+      #   with:
+      #     path: ~/.stack
+      #     key: v1-${{ matrix.os }}-stack-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}
       - uses: actions/download-artifact@v1
         with:
           name: release_upload_url
@@ -61,7 +60,7 @@ jobs:
           export ASSET_NAME="smoke-${TAG##*/}-$(uname -s)-$(uname -m)"
           echo ::set-output name=asset_name::"$ASSET_NAME"
           echo ::set-output name=asset_path::"out/publish/${ASSET_NAME}"
-      - run: nix-shell --pure --keep LANG ./nix/ci.nix --run 'cabal --enable-nix v2-update'
+      - run: nix-shell --pure --keep LANG ./nix/ci.nix --run 'make smoke.cabal'
       - run: nix-shell --pure --keep LANG ./nix/ci.nix --run 'make out/build/release/smoke'
       - run: |
           mkdir -p "$(dirname ${{ steps.asset.outputs.asset_path }})"
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index abdbada9..9ece5499 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -28,11 +28,10 @@ jobs:
           fi
         env:
           CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
-      - uses: actions/cache@v2
-        with:
-          path: ~/.stack
-          key: v1-${{ matrix.os }}-stack-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}
-          restore-keys: v1-${{ matrix.os }}-stack-
+      # - uses: actions/cache@v2
+      #   with:
+      #     path: ~/.stack
+      #     key: v1-${{ matrix.os }}-stack-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}
       - run: |
           mkdir -p ~/.stack
           cat > ~/.stack/config.yaml <<EOF
@@ -58,11 +57,10 @@ jobs:
       - uses: cachix/cachix-action@v6
         with:
           name: samirtalwar
-      - uses: actions/cache@v2
-        with:
-          path: ~/.stack
-          key: v1-${{ matrix.os }}-stack-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}
-          restore-keys: v1-${{ matrix.os }}-stack-
+      # - uses: actions/cache@v2
+      #   with:
+      #     path: ~/.stack
+      #     key: v1-${{ matrix.os }}-stack-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}
       - run: |
           mkdir -p ~/.stack
           cat > ~/.stack/config.yaml <<EOF
diff --git a/.gitignore b/.gitignore
index 4e70de01..71680095 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,3 @@ out
 # Stack
 /.stack-work
 *.cabal
-stack.yaml.lock
diff --git a/stack.yaml b/stack.yaml
index 89d57aa5..b1c7bcce 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.8
+resolver: lts-16.9
 packages:
   - .
 ghc-options:
diff --git a/stack.yaml.lock b/stack.yaml.lock
new file mode 100644
index 00000000..b8a609b9
--- /dev/null
+++ b/stack.yaml.lock
@@ -0,0 +1,12 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/lock_files
+
+packages: []
+snapshots:
+- completed:
+    size: 532380
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/9.yaml
+    sha256: 14a7cec114424e4286adde73364438927a553ed248cc50f069a30a67e3ee1e69
+  original: lts-16.9