diff --git a/.github/actions/cache-db-key/action.yml b/.github/actions/cache-db-key/action.yml
new file mode 100644
index 0000000000..f8bd9211bc
--- /dev/null
+++ b/.github/actions/cache-db-key/action.yml
@@ -0,0 +1,23 @@
+name: Generate cache-db key
+description: "Generate the cache key for database caching"
+inputs:
+  path:
+    required: false
+    default: "backups/backup.sql"
+    description: "Path to the backup file"
+outputs:
+  key:
+    description: "The generated cache key"
+    value: ${{ steps.generate-key.outputs.key }}
+runs:
+  using: "composite"
+  steps:
+    - name: Generate cache key
+      id: generate-key
+      shell: bash
+      env:
+        CACHE_NAME: cache-db
+        PATH_KEY: ${{ inputs.path }}
+        PRISMA_HASH: ${{ hashFiles('packages/prisma/schema.prisma', 'packages/prisma/migrations/**/**.sql', 'packages/prisma/*.ts') }}
+      run: |
+        echo "key=${CACHE_NAME}-${PATH_KEY}-${PRISMA_HASH}" >> $GITHUB_OUTPUT
diff --git a/.github/actions/cache-db/action.yml b/.github/actions/cache-db/action.yml
index 876bebd2a1..ec5738e426 100644
--- a/.github/actions/cache-db/action.yml
+++ b/.github/actions/cache-db/action.yml
@@ -7,21 +7,18 @@ inputs:
   path:
     required: false
     default: "backups/backup.sql"
-  COMMIT_SHA:
-    required: false
-    default: ""
-    description: "Commit SHA to include in cache key (passed from workflow)"
 runs:
   using: "composite"
   steps:
+    - name: Generate cache key
+      id: cache-key
+      uses: ./.github/actions/cache-db-key
+      with:
+        path: ${{ inputs.path }}
     - name: Cache database
       id: cache-db
       uses: actions/cache@v4
       env:
-        cache-name: cache-db
-        key-1: ${{ hashFiles('packages/prisma/schema.prisma', 'packages/prisma/migrations/**/**.sql', 'packages/prisma/*.ts') }}
-        key-2: ${{ github.event.pull_request.number || github.ref }}
-        key-3: ${{ inputs.COMMIT_SHA || github.event.pull_request.head.sha || github.sha }}
         DATABASE_URL: ${{ inputs.DATABASE_URL }}
         DATABASE_DIRECT_URL: ${{ inputs.DATABASE_URL }}
         E2E_TEST_CALCOM_QA_EMAIL: ${{ inputs.E2E_TEST_CALCOM_QA_EMAIL }}
@@ -29,7 +26,7 @@ runs:
         E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS: ${{ inputs.E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS }}
       with:
         path: ${{ inputs.path }}
-        key: ${{ runner.os }}-${{ env.cache-name }}-${{ inputs.path }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }}
+        key: ${{ steps.cache-key.outputs.key }}
     - run: yarn db-seed
       if: steps.cache-db.outputs.cache-hit != 'true'
       shell: bash
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index d15fcc6c45..d0df09ea1a 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -161,9 +161,20 @@ jobs:
       has_companion: ${{ steps.filter.outputs.has_companion }}
       commit-sha: ${{ steps.get_sha.outputs.commit-sha }}
       run-e2e: ${{ steps.check-if-pr-has-label.outputs.run-e2e == 'true' }}
+      db-cache-hit: ${{ steps.cache-db-check.outputs.cache-hit }}
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/dangerous-git-checkout
+      - name: Generate DB cache key
+        id: cache-db-key
+        uses: ./.github/actions/cache-db-key
+      - name: Check DB cache (lookup-only)
+        id: cache-db-check
+        uses: actions/cache/restore@v4
+        with:
+          path: backups/backup.sql
+          key: ${{ steps.cache-db-key.outputs.key }}
+          lookup-only: true
       - uses: dorny/paths-filter@v3
         id: filter
         with:
@@ -288,7 +299,7 @@ jobs:
     if: ${{ needs.prepare.outputs.run-e2e == 'true' && needs.prepare.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/setup-db.yml
     with:
-      COMMIT_SHA: ${{ needs.prepare.outputs.commit-sha }}
+      DB_CACHE_HIT: ${{ needs.prepare.outputs.db-cache-hit }}
     secrets: inherit
 
   build-api-v1:
diff --git a/.github/workflows/setup-db.yml b/.github/workflows/setup-db.yml
index 468dbbabbd..a4618d1fb9 100644
--- a/.github/workflows/setup-db.yml
+++ b/.github/workflows/setup-db.yml
@@ -3,11 +3,11 @@ name: Setup Database
 on:
   workflow_call:
     inputs:
-      COMMIT_SHA:
+      DB_CACHE_HIT:
         required: false
         type: string
-        default: ""
-        description: "Commit SHA to include in cache key"
+        default: "false"
+        description: "Whether the DB cache was hit (skip yarn-install and cache-db if true)"
 
 permissions:
   contents: read
@@ -49,6 +49,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/dangerous-git-checkout
       - uses: ./.github/actions/yarn-install
+        if: inputs.DB_CACHE_HIT != 'true'
       - uses: ./.github/actions/cache-db
-        with:
-          COMMIT_SHA: ${{ inputs.COMMIT_SHA || github.sha }}
+        if: inputs.DB_CACHE_HIT != 'true'