diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 06d9d16558f..6f75f28bb6a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
             - uses: actions/cache/save@v3
               with:
                 path: ./
-                key: web3-${{ matrix.node }}-${{github.event.pull_request.base.sha}}
+                key: web3-${{ matrix.node }}-${{github.sha}}
 
     build-esm:
         name: Build ESM
@@ -42,7 +42,7 @@ jobs:
             -   uses: actions/cache/restore@v3
                 with:
                    path: ./
-                   key: web3-18-${{github.event.pull_request.base.sha}}
+                   key: web3-18-${{github.sha}}
             -   run: yarn build:esm
     build-types:
         name: Build Types
@@ -55,7 +55,7 @@ jobs:
             -   uses: actions/cache/restore@v3
                 with:
                     path: ./
-                    key: web3-18-${{github.event.pull_request.base.sha}}
+                    key: web3-18-${{github.sha}}
             -   run: yarn build:types
     lint:
         name: Lint
@@ -68,7 +68,7 @@ jobs:
             -   uses: actions/cache/restore@v3
                 with:
                     path: ./
-                    key: web3-18-${{github.event.pull_request.base.sha}}
+                    key: web3-18-${{github.sha}}
             -   run: npx ts-node scripts/init.ts
             -   run: yarn lint
 
@@ -83,13 +83,13 @@ jobs:
             -   uses: actions/cache/restore@v3
                 with:
                     path: ./
-                    key: web3-18-${{github.event.pull_request.base.sha}}
+                    key: web3-18-${{github.sha}}
             -   name: Restore default branch stats
                 if: github.event_name != 'push'
                 uses: actions/cache/restore@v3
                 with:
                     path: packages/web3/dist/4.x.json
-                    key: web3-bundle-stats-4x-${{github.event.pull_request.base.sha}}
+                    key: web3-bundle-stats-4x-${{github.sha}}
             -   run: yarn build:web:analyze
                 env:
                     STATS_FILE: ${{ github.ref_name }}.json
@@ -122,7 +122,7 @@ jobs:
             - uses: actions/cache/restore@v3
               with:
                     path: ./
-                    key: web3-${{ matrix.node }}-${{github.event.pull_request.base.sha}}
+                    key: web3-${{ matrix.node }}-${{github.sha}}
             - run: yarn test:unit
             - name: Upload coverage to Codecov
               uses: codecov/codecov-action@v3
@@ -144,7 +144,7 @@ jobs:
           - uses: actions/cache/restore@v3
             with:
                 path: ./
-                key: web3-18-${{github.event.pull_request.base.sha}}
+                key: web3-18-${{github.sha}}
           - run: npx hardhat node &
           - run: yarn test:e2e:hardhat:http
             shell: bash
@@ -167,7 +167,7 @@ jobs:
             -   uses: actions/cache/restore@v3
                 with:
                     path: ./
-                    key: web3-18-${{github.event.pull_request.base.sha}}
+                    key: web3-18-${{github.sha}}
             -   run: yarn test:e2e:geth:${{ matrix.mode }}
                 shell: bash
 
@@ -188,7 +188,7 @@ jobs:
           - uses: actions/cache/restore@v3
             with:
               path: ./
-              key: web3-18-${{github.event.pull_request.base.sha}}
+              key: web3-18-${{github.sha}}
           - run: npx hardhat node &
           - run: npm install --no-package-lock --no-save --force cypress
           - name: Cypress run
@@ -214,7 +214,7 @@ jobs:
             -   uses: actions/cache/restore@v3
                 with:
                     path: ./
-                    key: web3-18-${{github.event.pull_request.base.sha}}
+                    key: web3-18-${{github.sha}}
             -   run: yarn install  --ignore-scripts
             -   run: yarn build:cjs
             -   run: yarn run build:docs
@@ -237,7 +237,7 @@ jobs:
             -   uses: actions/cache/restore@v3
                 with:
                     path: ./
-                    key: web3-18-${{github.event.pull_request.base.sha}}
+                    key: web3-18-${{github.sha}}
                 # @octokit/core not supported on node 16, so I can't add it to the package.json
             -   run: npm install --no-package-lock --no-save --force @octokit/core
             -   name: Restore main branch benchmark data