diff --git a/.github/workflows/block-build.yml b/.github/workflows/block-build.yml
index 590c77f6cb..17d2792281 100644
--- a/.github/workflows/block-build.yml
+++ b/.github/workflows/block-build.yml
@@ -20,7 +20,7 @@ defaults:
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-block
   cancel-in-progress: true
-
+> tsc --build ./tsconfig.prod.esm.json
 jobs:
   test-block:
     runs-on: ubuntu-latest
@@ -49,7 +49,7 @@ jobs:
         id: submodules-cache
         with:
           path: ${{github.workspace}}/packages/ethereum-tests
-          key: submodule-cache-key
+          key: ${{ inputs.submodule-cache-key}}
 
       - name: Check if ethereum-tests is present (if not, fail)
         if: steps.submodules-cache.outputs.cache-hit != 'true'
diff --git a/.github/workflows/vm-build.yml b/.github/workflows/vm-build.yml
index 777a9d185d..a94270d463 100644
--- a/.github/workflows/vm-build.yml
+++ b/.github/workflows/vm-build.yml
@@ -86,6 +86,13 @@ jobs:
         if: steps.dep-cache.outputs.cache-hit != 'true'
         run: npm ci     
         working-directory: ${{ github.workspace }}
+        
+      - uses: actions/cache/restore@v4
+        name: Initialize ethereum-tests
+        id: submodules-cache
+        with:
+          path: ${{github.workspace}}/packages/ethereum-tests
+          key: ${{ inputs.submodule-cache-key}}
 
       - run: npm run test:state:selectedForks
 
diff --git a/.github/workflows/vm-pr.yml b/.github/workflows/vm-pr.yml
index b4f9e6e53f..589ead4147 100644
--- a/.github/workflows/vm-pr.yml
+++ b/.github/workflows/vm-pr.yml
@@ -49,7 +49,7 @@ jobs:
         id: submodules-cache
         with:
           path: ${{github.workspace}}/packages/ethereum-tests
-          key: ethereum-tests-${{ github.run_id }}
+          key: ${{ inputs.submodule-cache-key}}
 
       - name: Check if ethereum-tests is present (if not, fail)
         if: steps.submodules-cache.outputs.cache-hit != 'true'
@@ -93,7 +93,7 @@ jobs:
         id: submodules-cache
         with:
           path: ${{github.workspace}}/packages/ethereum-tests
-          key: ethereum-tests-${{ github.run_id }}
+          key: ${{ inputs.submodule-cache-key}}
 
       - name: Check if ethereum-tests is present (if not, fail)
         if: steps.submodules-cache.outputs.cache-hit != 'true'
@@ -149,7 +149,7 @@ jobs:
         id: submodules-cache
         with:
           path: ${{github.workspace}}/packages/ethereum-tests
-          key: submodule-cache-key
+          key: ${{ inputs.submodule-cache-key}}
 
       - name: Check if ethereum-tests is present (if not, fail)
         if: steps.submodules-cache.outputs.cache-hit != 'true'
@@ -200,7 +200,7 @@ jobs:
         id: submodules-cache
         with:
           path: ${{github.workspace}}/packages/ethereum-tests
-          key: ethereum-tests-${{ github.run_id }}
+          key: ${{ inputs.submodule-cache-key}}
 
       - name: Check if ethereum-tests is present (if not, fail)
         if: steps.submodules-cache.outputs.cache-hit != 'true'
@@ -263,7 +263,7 @@ jobs:
         id: submodules-cache
         with:
           path: ${{github.workspace}}/packages/ethereum-tests
-          key: ethereum-tests-${{ github.run_id }}
+          key: ${{ inputs.submodule-cache-key}}
 
       - name: Check if ethereum-tests is present (if not, fail)
         if: steps.submodules-cache.outputs.cache-hit != 'true'