diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
index bf3020b..0ecd4ba 100644
--- a/.github/workflows/haskell-ci.yml
+++ b/.github/workflows/haskell-ci.yml
@@ -30,8 +30,9 @@ jobs:
         path: |
           ~/.cabal-devx
           dist-newstyle
-        key: ${{ runner.os }}-ghc964-${{ hashFiles('**/*.cabal', '**/cabal.project', '**/cabal.project.freeze') }}
-        restore-keys: ${{ runner.os }}-ghc964-
+        restore-keys: |
+          ${{ runner.os }}-ghc964-${{ hashFiles('**/*.cabal', '**/cabal.project', '**/cabal.project.freeze') }}
+          ${{ runner.os }}-ghc964-
     - name: Cabal setup
       shell: devx {0}
       run: |
diff --git a/cabal.project b/cabal.project
index a6d4812..343ade2 100644
--- a/cabal.project
+++ b/cabal.project
@@ -11,22 +11,28 @@ repository cardano-haskell-packages
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
 index-state:
-  , hackage.haskell.org  2024-05-29T10:15:00Z
-  , cardano-haskell-packages 2024-05-24T09:29:56Z
+  , hackage.haskell.org  2024-06-12T10:15:00Z
+  , cardano-haskell-packages 2024-06-12T11:52:25Z
 
 tests: true
 
-constraints:
-  -- Newer version fails to build
-  -- https://github.com/input-output-hk/io-sim/issues/164
-  io-classes-mtl == 0.1.1.0
-
 source-repository-package
   type: git
   location: https://github.com/mlabs-haskell/clb
   tag: 925f80a9755d2292edf4589afb50dc1146b36ac2
   --sha256: 6+Os/mQDzBOU+TkTD+n/T1MFcI+Mn0/tcBMJhLRfqyA=
 
+-- Cannot use new commit, because it requires `plutus-ledger-api==1.29`
+source-repository-package
+  type: git
+  location: https://github.com/Plutonomicon/plutarch-plutus
+  tag: fcdd2209433d8b8979e820dc4fa9aad5f202216d
+  --sha256: 6+Os/mQDzBOU+TkTD+n/T1MFcI+Mn0/tcBMJhLRfqyA=
+  subdir:
+    .
+    plutarch-ledger-api
+    plutarch-extra
+
 packages: .
 
 package cardano-crypto-praos
diff --git a/cem-script.cabal b/cem-script.cabal
index 480d712..2533d76 100644
--- a/cem-script.cabal
+++ b/cem-script.cabal
@@ -60,12 +60,15 @@ common common-lang
 common common-onchain
   import:        common-lang
   build-depends:
+    , plutarch
+    , plutarch-extra
+    , plutarch-ledger-api
     , plutus-core
-    , plutus-ledger-api
-    , plutus-tx          >=1.24
+    , plutus-ledger-api    ^>=1.23.0.0
+    , plutus-tx
     , plutus-tx-plugin
-    , template-haskell   >=2.20
-    , th-abstraction     >=0.6.0.0
+    , template-haskell
+    , th-abstraction       >=0.6.0.0
 
   if !flag(dev)
     ghc-options: -fplugin-opt PlutusTx.Plugin:defer-errors
diff --git a/src/Cardano/CEM/OnChain.hs b/src/Cardano/CEM/OnChain.hs
index ac3d7da..44ef329 100644
--- a/src/Cardano/CEM/OnChain.hs
+++ b/src/Cardano/CEM/OnChain.hs
@@ -141,8 +141,9 @@ genericCEMScript script scriptStage =
                 && let
                     expectedInterval =
                       always
-                      -- stageToOnChainInterval' stageParams (traceError "TODO")
                     in
+                    -- stageToOnChainInterval' stageParams (traceError "TODO")
+
                     traceIfFalse "Wrong interval for transition stage"
                       $ expectedInterval
                       `contains` txInfoValidRange info