diff --git a/.github/workflows/test-invoke-conda.yml b/.github/workflows/test-invoke-conda.yml
index 157a68b8c6..e81444c5c4 100644
--- a/.github/workflows/test-invoke-conda.yml
+++ b/.github/workflows/test-invoke-conda.yml
@@ -79,17 +79,17 @@ jobs:
         with:
           path: ${{ env.CONDA }}/envs/${{ env.CONDA_ENV_NAME }}
           key: ${{ env.cache-name }}
-          restore-keys: ${{ env.cache-name }}-${{ runner.os }}-${{ hashFiles(env.conda-env-file) }}
+          restore-keys: ${{ env.cache-name }}-${{ runner.os }}-${{ hashFiles('${{ matrix.environment-file }}') }}
 
       - name: Use cached Conda Packages
         uses: actions/cache@v3
         env:
-          cache-name: cache-conda-env-${{ env.CONDA_ENV_NAME }}
+          cache-name: cache-conda-pkgs-${{ env.CONDA_ENV_NAME }}
           conda-env-file: ${{ matrix.environment-file }}
         with:
           path: ${{ env.CONDA_PKGS_DIR }}
           key: ${{ env.cache-name }}
-          restore-keys: ${{ env.cache-name }}-${{ runner.os }}-${{ hashFiles(env.conda-env-file) }}
+          restore-keys: ${{ env.cache-name }}-${{ runner.os }}-${{ hashFiles('${{ matrix.environment-file }}') }}
 
       - name: Activate Conda Env
         uses: conda-incubator/setup-miniconda@v2