diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
index 6cdeacc5a..8d1caed94 100644
--- a/.github/workflows/formatting.yml
+++ b/.github/workflows/formatting.yml
@@ -27,8 +27,6 @@ jobs:
           filters: |
             frontend:
               - 'frontend/**'
-            tsx:
-              - '*.tsx'
 
       - uses: actions/setup-node@v3
         if: steps.changes.outputs.frontend == 'true'
@@ -63,7 +61,7 @@ jobs:
         working-directory: frontend
 
       - name: Build GraphQL Types
-        if: steps.changes.outputs.frontend == 'true' && steps.changes.outputs.tsx == 'true'
+        if: steps.changes.outputs.frontend == 'true'
         run: pnpm build
         working-directory: frontend/packages/data-portal
 
diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
index 604a5f7da..9a467f081 100644
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@@ -39,8 +39,28 @@ jobs:
         uses: pnpm/action-setup@v2
         with:
           version: 8.9.0
+          run_install: false
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
       - name: Install dependencies with PNPM
         run: pnpm install --frozen-lockfile
+        working-directory: frontend
+
+      - name: Build GraphQL Types
+        run: pnpm build
+        working-directory: frontend/packages/data-portal
 
       - name: ${{ matrix.name }}
         run: ${{ matrix.run }}