diff --git a/.github/workflows/ci-matrix.yml b/.github/workflows/ci-matrix.yml
index 18e9434..c1ba93c 100644
--- a/.github/workflows/ci-matrix.yml
+++ b/.github/workflows/ci-matrix.yml
@@ -27,16 +27,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['8.8.4', '8.10.7', '9.0.2', '9.2.2']
-        cabal: ['3.6.2.0']
+        ghc: ['8.10.7', '9.2.7', '9.4.4']
+        cabal: ['3.8.1.0']
         os: [ubuntu-latest, macOS-latest]
         exclude:
-          - os: macOS-latest
-            ghc: 8.8.4
           - os: macOS-latest
             ghc: 8.10.7
           - os: macOS-latest
-            ghc: 9.0.2
+            ghc: 9.2.7
 
     name: GHC ${{ matrix.ghc }} on ${{ matrix.os }} asl-translator
 
@@ -52,8 +50,8 @@ jobs:
         ghc-version: ${{ matrix.ghc }}
         cabal-version: ${{ matrix.cabal }}
 
-    - uses: actions/cache@v2
-      name: Cache cabal-store
+    - uses: actions/cache/restore@v3
+      name: Restore cabal store cache
       with:
         path: |
           ${{ steps.setup-haskell.outputs.cabal-store }}
@@ -82,3 +80,13 @@ jobs:
       run: |
         cabal v2-test pkg:asl-translator
 
+    - uses: actions/cache/save@v3
+      name: Save cabal store cache
+      if: always()
+      with:
+        path: |
+          ${{ steps.setup-haskell.outputs.cabal-store }}
+          dist-newstyle
+        key: |
+          ${{ env.CACHE_VERSION }}-cabal-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles(format('cabal.GHC-{0}.config', matrix.ghc)) }}-${{ github.ref }}
+          ${{ env.CACHE_VERSION }}-cabal-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles(format('cabal.GHC-{0}.config', matrix.ghc)) }}-
diff --git a/asl-translator.cabal b/asl-translator.cabal
index a59c254..6c7cae1 100644
--- a/asl-translator.cabal
+++ b/asl-translator.cabal
@@ -39,7 +39,7 @@ common shared-properties
                        ilist,
                        integer-logarithms,
                        bimap,
-                       text >= 1 && < 2,
+                       text >= 1 && < 2.1,
                        mtl,
                        transformers,
                        lens,
@@ -106,7 +106,7 @@ executable asl-translator-exec
                        what4,
                        asl-translator,
                        split,
-                       text >= 1 && < 2
+                       text >= 1 && < 2.1
   hs-source-dirs:      exe
   ghc-options:         -Wcompat -Wall -O2 -threaded -rtsopts "-with-rtsopts=-N"
   default-language: Haskell2010
diff --git a/lib/Language/ASL/Formulas.hs b/lib/Language/ASL/Formulas.hs
index 15ef657..89c7464 100644
--- a/lib/Language/ASL/Formulas.hs
+++ b/lib/Language/ASL/Formulas.hs
@@ -16,6 +16,7 @@ semantics, represented as a library of what4 expressions.
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeOperators #-}
 
 module Language.ASL.Formulas
     ( getFunctionFormulas
diff --git a/lib/Language/ASL/Globals.hs b/lib/Language/ASL/Globals.hs
index 3c98737..60a634b 100644
--- a/lib/Language/ASL/Globals.hs
+++ b/lib/Language/ASL/Globals.hs
@@ -22,6 +22,7 @@
 
 {-# LANGUAGE AllowAmbiguousTypes #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE UndecidableSuperClasses #-}
 
 {-# OPTIONS_GHC -ddump-splices -ddump-to-file -dth-dec-file #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
diff --git a/lib/Language/ASL/Translation/Driver.hs b/lib/Language/ASL/Translation/Driver.hs
index e0cb85f..87e94d6 100644
--- a/lib/Language/ASL/Translation/Driver.hs
+++ b/lib/Language/ASL/Translation/Driver.hs
@@ -36,6 +36,7 @@ normalized, then written out again.
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE ViewPatterns #-}
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE TypeOperators #-}
 
 module Language.ASL.Translation.Driver
   ( TranslatorOptions(..)
diff --git a/submodules/crucible b/submodules/crucible
index b558ba2..ad4a553 160000
--- a/submodules/crucible
+++ b/submodules/crucible
@@ -1 +1 @@
-Subproject commit b558ba2341b11c88e668ed3f772f4d1960275229
+Subproject commit ad4a553487eeb5c6bbb5abf4bde26af905bf0254
diff --git a/submodules/dismantle b/submodules/dismantle
index 48433e7..82849d4 160000
--- a/submodules/dismantle
+++ b/submodules/dismantle
@@ -1 +1 @@
-Subproject commit 48433e7ccb02924b2f4695c8c9f09fb9cfccdfc4
+Subproject commit 82849d4aa097e7e802953286339ef9ea5e0e4bf4