diff --git a/.github/workflows/data.yml b/.github/workflows/data.yml
index a353324a1..b5283db58 100644
--- a/.github/workflows/data.yml
+++ b/.github/workflows/data.yml
@@ -102,7 +102,7 @@ jobs:
           key: webbpsf-${{ steps.retrieve_webbpsf_hash.outputs.hash }}
       - id: cache_key
         name: construct combined cache key
-        run: echo "key=data-${{ steps.retrieve_webbpsf_hash.outputs.hash }}-" >> $GITHUB_OUTPUT
+        run: echo "key=data-${{ steps.retrieve_webbpsf_hash.outputs.hash }}" >> $GITHUB_OUTPUT
       - name: cache combined data directory
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/roman_ci.yml b/.github/workflows/roman_ci.yml
index ae872a668..50976ffac 100644
--- a/.github/workflows/roman_ci.yml
+++ b/.github/workflows/roman_ci.yml
@@ -42,7 +42,7 @@ jobs:
         DD_GIT_COMMIT_SHA: ${{ github.sha }}
         DD_GIT_BRANCH: ${{ github.ref_name }}
       cache-path: ${{ needs.data.outputs.path }}
-      cache-key: data-${{ needs.data.outputs.data_hash }}-${{ needs.data.outputs.crds_context }}
+      cache-key: ${{ needs.data.outputs.cache_key }}-${{ needs.data.outputs.crds_context }}
       cache-restore-keys: ${{ needs.data.outputs.cache_key }}
       envs: |
         - linux: py39-oldestdeps-cov
diff --git a/.github/workflows/roman_ci_cron.yaml b/.github/workflows/roman_ci_cron.yaml
index 98873b8ff..f91b35967 100644
--- a/.github/workflows/roman_ci_cron.yaml
+++ b/.github/workflows/roman_ci_cron.yaml
@@ -37,7 +37,7 @@ jobs:
         CRDS_CLIENT_RETRY_COUNT: 3
         CRDS_CLIENT_RETRY_DELAY_SECONDS: 20
       cache-path: ${{ needs.data.outputs.crds_path }}
-      cache-key: data-${{ needs.data.outputs.webbpsf_hash }}-${{ needs.data.outputs.crds_context }}
+      cache-key: ${{ needs.data.outputs.cache_key }}-${{ needs.data.outputs.crds_context }}
       cache-restore-keys: ${{ needs.data.outputs.cache_key }}
       envs: |
         - macos: py39
diff --git a/.github/workflows/tests_devdeps.yml b/.github/workflows/tests_devdeps.yml
index 710a96a4d..497e35d89 100644
--- a/.github/workflows/tests_devdeps.yml
+++ b/.github/workflows/tests_devdeps.yml
@@ -39,7 +39,7 @@ jobs:
         CRDS_CLIENT_RETRY_COUNT: 3
         CRDS_CLIENT_RETRY_DELAY_SECONDS: 20
       cache-path: ${{ needs.data.outputs.crds_path }}
-      cache-key: data-${{ needs.data.outputs.webbpsf_hash }}-${{ needs.data.outputs.crds_context }}
+      cache-key: ${{ needs.data.outputs.cache_key }}-${{ needs.data.outputs.crds_context }}
       cache-restore-keys: ${{ needs.data.outputs.cache_key }}
       envs: |
         - linux: py39-devdeps