diff --git a/.github/workflows/ci-db-tests.yml b/.github/workflows/ci-db-tests.yml
index 4f54e2ea..7a4aa3d1 100644
--- a/.github/workflows/ci-db-tests.yml
+++ b/.github/workflows/ci-db-tests.yml
@@ -32,7 +32,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           extensions: ${{ env.extensions }}
-          key: db-tests-extensions
+          key: db-tests-extensions-${{ inputs.platform }}
       - name: Cache extensions
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/ci-mutation-tests.yml b/.github/workflows/ci-mutation-tests.yml
index 945f0abd..16937a2e 100644
--- a/.github/workflows/ci-mutation-tests.yml
+++ b/.github/workflows/ci-mutation-tests.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           extensions: ${{ env.extensions }}
-          key: mutation-tests-extensions
+          key: mutation-tests-extensions-${{ inputs.test-group }}
       - name: Cache extensions
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index a0ed17ea..078bc551 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -31,7 +31,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           extensions: ${{ env.extensions }}
-          key: tests-extensions
+          key: tests-extensions-${{ inputs.test-group }}
       - name: Cache extensions
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 397bb9ab..c76f47bc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           extensions: ${{ env.extensions }}
-          key: tests-extensions
+          key: tests-extensions-${{ matrix.command }}
       - name: Cache extensions
         uses: actions/cache@v2
         with: