diff --git a/.circleci/config.yml b/.circleci/config.yml
index ca06ff83f0..690d28420d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,15 +12,9 @@ defaults: &defaults
         name: Figure out resolver for better caching
         command: grep '^resolver:' stack-build.txt > resolver.txt
 
-    - run:
-        name: Create a composite cabal file for changes detection
-        command: find . -name "*.cabal" | grep -v -e "stack-work" -e "dist-newstyle" -e "submodules" -e "testdata" | sort | xargs cat > all-cabal.txt
-
     - restore_cache:
         keys:
-          - v2-stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }}
-          - v2-stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}
-          - v2-stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
+          - v4-stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
 
     - run:
         name: Stack upgrade
@@ -28,17 +22,17 @@ defaults: &defaults
 
     - run:
         name: Stack setup
-        command: stack -j 2 --stack-yaml=${STACK_FILE} setup
+        command: stack -j2 --stack-yaml=${STACK_FILE} setup
 
     - run:
         name: Build (we need the exe for tests)
         # need j1, else ghc-lib-parser triggers OOM
-        command: stack -j 1 --stack-yaml=${STACK_FILE} install --no-terminal
+        command: stack -j1 --stack-yaml=${STACK_FILE} install --no-terminal
         no_output_timeout: 30m
 
     - run:
         name: Build Testsuite without running it
-        command: stack -j 1 --stack-yaml=${STACK_FILE} build --test --no-run-tests --no-terminal
+        command: stack -j1 --stack-yaml=${STACK_FILE} build --test --no-run-tests --no-terminal
         no_output_timeout: 30m
 
     - store_artifacts:
@@ -46,20 +40,9 @@ defaults: &defaults
         destination: bin
 
     - save_cache:
-        key: v2-stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
+        key: v4-stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
         paths: &cache_paths
           - ~/.stack
-          - ~/build/.stack-work
-          - ~/build/ghcide/.stack-work
-
-    - run:
-        name: Build including tests
-        command: stack --stack-yaml=${STACK_FILE} test --no-run-tests --no-terminal
-        no_output_timeout: 120m
-
-    - save_cache:
-        key: v2-stack-cache-{{ .Environment.HIE_CACHE }}-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }}
-        paths: *cache_paths
 
 version: 2
 jobs:
diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml
index 58e1eb6263..806559bd8c 100644
--- a/stack-8.10.2.yaml
+++ b/stack-8.10.2.yaml
@@ -75,8 +75,6 @@ extra-deps:
   # https://github.com/haskell/lsp/pull/332
 
 configure-options:
-  $targets:
-      - --enable-executable-dynamic
   ghcide:
     - --disable-library-for-ghci
   haskell-language-server:
diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml
index ba3c3698e0..92828a603f 100644
--- a/stack-8.10.3.yaml
+++ b/stack-8.10.3.yaml
@@ -75,8 +75,6 @@ extra-deps:
   # https://github.com/haskell/lsp/pull/332
 
 configure-options:
-  $targets:
-      - --enable-executable-dynamic
   ghcide:
       - --disable-library-for-ghci
   haskell-language-server:
diff --git a/stack-8.10.4.yaml b/stack-8.10.4.yaml
index 4968bbee03..c76e4a1cf5 100644
--- a/stack-8.10.4.yaml
+++ b/stack-8.10.4.yaml
@@ -77,8 +77,6 @@ extra-deps:
   # - hlint-3.3@sha256:4218ad6e03050f5d68aeba0e025f5f05e366c8fd49657f2a19df04ee31b2bb23,4154
 
 configure-options:
-  $targets:
-      - --enable-executable-dynamic
   ghcide:
       - --disable-library-for-ghci
   haskell-language-server:
diff --git a/stack-8.10.5.yaml b/stack-8.10.5.yaml
index 323c2371c9..e83cb5d40b 100644
--- a/stack-8.10.5.yaml
+++ b/stack-8.10.5.yaml
@@ -79,8 +79,6 @@ extra-deps:
   # - hlint-3.3@sha256:4218ad6e03050f5d68aeba0e025f5f05e366c8fd49657f2a19df04ee31b2bb23,4154
 
 configure-options:
-  $targets:
-      - --enable-executable-dynamic
   ghcide:
       - --disable-library-for-ghci
   haskell-language-server:
diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml
index c838b35967..6fca47b737 100644
--- a/stack-8.6.4.yaml
+++ b/stack-8.6.4.yaml
@@ -124,8 +124,6 @@ flags:
 
 
 configure-options:
-  $targets:
-      - --enable-executable-dynamic
   ghcide:
       - --disable-library-for-ghci
   haskell-language-server:
diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
index 0aefc1f9bb..1d53854c22 100644
--- a/stack-8.6.5.yaml
+++ b/stack-8.6.5.yaml
@@ -113,8 +113,6 @@ extra-deps:
   # https://github.com/haskell/lsp/pull/332
 
 configure-options:
-  $targets:
-      - --enable-executable-dynamic
   ghcide:
     - --disable-library-for-ghci
   haskell-language-server:
diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml
index f51324d932..415ba7955a 100644
--- a/stack-8.8.3.yaml
+++ b/stack-8.8.3.yaml
@@ -92,8 +92,6 @@ extra-deps:
   # https://github.com/haskell/lsp/pull/332
 
 configure-options:
-  $targets:
-      - --enable-executable-dynamic
   ghcide:
     - --disable-library-for-ghci
   haskell-language-server:
diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml
index cba8cc6e11..e33d4108b6 100644
--- a/stack-8.8.4.yaml
+++ b/stack-8.8.4.yaml
@@ -89,8 +89,6 @@ extra-deps:
   # https://github.com/haskell/lsp/pull/332
 
 configure-options:
-  $targets:
-      - --enable-executable-dynamic
   ghcide:
     - --disable-library-for-ghci
   haskell-language-server:
diff --git a/stack-9.0.1.yaml b/stack-9.0.1.yaml
index 86d074ff75..96de4dda17 100644
--- a/stack-9.0.1.yaml
+++ b/stack-9.0.1.yaml
@@ -102,8 +102,6 @@ extra-deps:
   commit: 16e19aaf34e286f3d27b3988c61040823ec66537
 
 configure-options:
-  $targets:
-      - --enable-executable-dynamic
   ghcide:
       - --disable-library-for-ghci
   haskell-language-server: