diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3c7355f6..2b622f0d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,7 +27,7 @@ jobs:
           ./node_modules
           ./packages/*/dist
           ./packages/*/node_modules
-        key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
+        key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.sha }}
     - name: Install Dependencies
       if: steps.cache.outputs.cache-hit != 'true'
       run: |
@@ -60,7 +60,7 @@ jobs:
             ./node_modules
             ./packages/*/dist
             ./packages/*/node_modules
-          key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
+          key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.sha }}
       - name: Install Dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
@@ -88,7 +88,7 @@ jobs:
             ./node_modules
             ./packages/*/dist
             ./packages/*/node_modules
-          key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
+          key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.sha }}
       - name: Install Dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
@@ -115,7 +115,7 @@ jobs:
             ./node_modules
             ./packages/*/dist
             ./packages/*/node_modules
-          key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
+          key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.sha }}
       - name: Install Dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
@@ -142,7 +142,7 @@ jobs:
             ./node_modules
             ./packages/*/dist
             ./packages/*/node_modules
-          key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
+          key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.sha }}
       - name: Install Dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
@@ -150,31 +150,32 @@ jobs:
             npm run --if-present build
       - run: npx xvfb-maybe npm run --if-present test:electron-main --bail
 
-  # test-electron-renderer:
-  #   needs: check
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - uses: actions/setup-node@v2
-  #      with:
-  #        node-version: lts/*
-  #     - uses: actions/cache@v2
-  #       id: cache
-  #       env:
-  #         CACHE_NAME: cache-node-modules
-  #       with:
-  #         path: |
-  #           ~/.npm
-  #           ./node_modules
-  #           ./packages/*/node_modules
-  #           ./packages/*/dist
-  #         key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
-  #     - name: Install Dependencies
-  #       if: steps.cache.outputs.cache-hit != 'true'
-  #       run: |
-  #           npm run --if-present build
-  #           npm install
-  #     - run: npx xvfb-maybe npm run --if-present test:electron-renderer --bail
+  test-electron-renderer:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: lts/*
+      - uses: actions/cache@v2
+        id: cache
+        env:
+          CACHE_NAME: cache-node-modules
+        with:
+          path: |
+            ~/.npm
+            ./dist
+            ./node_modules
+            ./packages/*/dist
+            ./packages/*/node_modules
+          key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.sha }}
+      - name: Install Dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+            npm install
+            npm run --if-present build
+      - run: npx xvfb-maybe npm run --if-present test:electron-renderer --bail
 
   release:
     needs: [test-node, test-chrome, test-firefox, test-electron-main]
@@ -198,7 +199,7 @@ jobs:
             ./node_modules
             ./packages/*/dist
             ./packages/*/node_modules
-          key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
+          key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.sha }}
       - name: Install Dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
diff --git a/package.json b/package.json
index f48e8518..eb78cf21 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
     "test:browser": "aegir test -t browser -f ./dist/test/**/*.js",
     "test:node": "aegir test -t node -f ./dist/test/**/*.js",
     "test:electron-main": "aegir test -t electron-main -f ./dist/test/**/*.js",
-    "test:electron-renderer": "aegir test -t electron-renderer -f ./dist/test/**/*.js",
     "lint": "aegir ts -p check && aegir lint",
     "build": "tsc",
     "dep-check": "aegir dep-check dist/src/**/*.js dist/test/**/*.js",