diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 3cddf863e..281989eeb 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -43,21 +43,30 @@ jobs:
           Get-PSDrive
 
       - name: Restore Conda env cache
-        id: conda-cache
-        uses: actions/cache@v3
+        id: restore-conda-cache
+        uses: actions/cache/restore@v3
         with:
           path: |
             ${{ env.CONDA_ENV_PATH }}
-          key: ${{ env.RUN_STAMP }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-windows-env.yml') }}-${{ env.DATE }}
+          key: ${{ runner.os }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-windows-env.yml') }}-${{ env.DATE }}
           restore-keys: |
-            ${{ env.RUN_STAMP }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-windows-env.yml') }}-
+            ${{ runner.os }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-windows-env.yml') }}-
 
       - name: Update Conda env
-        if: steps.conda-cache.cache-hit != 'true'
+        if: steps.restore-conda-cache.outputs.cache-hit != 'true'
         run: |
           & $env:CONDA\condabin\conda.bat update conda
           & $env:CONDA\condabin\conda.bat env update -f omniscidb/scripts/mapd-deps-conda-windows-env.yml
 
+      - name: Save Conda env cache
+        if: steps.restore-conda-cache.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v3
+        with:
+          path: |
+            ${{ env.CONDA_ENV_PATH }}
+          key: ${{ runner.os }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-dev-env.yml') }}-${{ env.DATE }}
+
+
       - name: Restore Maven cache
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5c81432d2..cb73d8e75 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,21 +44,29 @@ jobs:
           echo "DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV
 
       - name: Restore Conda env cache
-        id: conda-cache
-        uses: actions/cache@v3
+        id: restore-conda-cache
+        uses: actions/cache/restore@v3
         with:
           path: |
             ${{ env.CONDA_ENV_PATH }}
-          key: ${{ env.RUN_STAMP }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-dev-env.yml') }}-${{ env.DATE }}
+          key: ${{ runner.os }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-dev-env.yml') }}-${{ env.DATE }}
           restore-keys: |
-            ${{ env.RUN_STAMP }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-dev-env.yml') }}-
+            ${{ runner.os }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-dev-env.yml') }}-
 
       - name: Update Conda env
-        if: steps.conda-cache.cache-hit != 'true'
+        if: steps.restore-conda-cacheoutputs.cache-hit != 'true'
         run: |
           conda update conda
           conda env update -f omniscidb/scripts/mapd-deps-conda-dev-env.yml
 
+      - name: Save Conda env cache
+        if: steps.restore-conda-cacheoutputs.cache-hit != 'true'
+        uses: actions/cache/save@v3
+        with:
+          path: |
+            ${{ env.CONDA_ENV_PATH }}
+          key: ${{ runner.os }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-dev-env.yml') }}-${{ env.DATE }}
+
       - name: Install cuda
         if: inputs.name == 'cuda' || inputs.name == 'all-gpus'
         run: |
diff --git a/.github/workflows/modin.yml b/.github/workflows/modin.yml
index 818d56262..49171628d 100644
--- a/.github/workflows/modin.yml
+++ b/.github/workflows/modin.yml
@@ -23,14 +23,33 @@ jobs:
 
       - name: Set env context
         run: |
-          echo RUN_STAMP=${{ runner.os }}-${{ (env.cuda_compiler_version != 'None') && format('cuda{0}', env.cuda_compiler_version) || 'cpu' }} >>$GITHUB_ENV
+          echo RUN_STAMP=${{ runner.os }}-cpu >>$GITHUB_ENV
           echo CONDA_ENV_PATH=$CONDA/envs/${{ env.CONDA_ENV }} >>$GITHUB_ENV
 
-      - name: Update Conda
+      - name: Restore Conda env cache
+        id: restore-conda-cache
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            ${{ env.CONDA_ENV_PATH }}
+          key: ${{ runner.os }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-dev-env.yml') }}-${{ env.DATE }}
+          restore-keys: |
+            ${{ runner.os }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-dev-env.yml') }}-
+
+      - name: Update Conda env
+        if: steps.restore-conda-cache.outputs.cache-hit != 'true'
         run: |
           conda update conda
           conda env update -f omniscidb/scripts/mapd-deps-conda-dev-env.yml
 
+      - name: Save Conda env cache
+        if: steps.restore-conda-cache.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v3
+        with:
+          path: |
+            ${{ env.CONDA_ENV_PATH }}
+          key: ${{ runner.os }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-dev-env.yml') }}-${{ env.DATE }}
+
       - name: Restore Maven cache
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 21bd1cdb9..a53e62a87 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set env context
         run: |
           echo CONDA_PATH=$CONDA >>$GITHUB_ENV
-          echo RUN_STAMP=${{ runner.os }}-${{ (env.cuda_compiler_version != 'None') && format('cuda{0}', env.cuda_compiler_version) || 'cpu' }} >>$GITHUB_ENV
+          echo RUN_STAMP=${{ runner.os }}-cpu >>$GITHUB_ENV
           echo CONDA_ENV_PATH=$CONDA/envs/${{ env.CONDA_ENV }} >>$GITHUB_ENV
 
       - name: Restore Conda env cache
@@ -25,23 +25,23 @@ jobs:
         with:
           path: |
             ${{ env.CONDA_ENV_PATH }}
-          key: ${{ env.RUN_STAMP }}-conda-pytest-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-dev-env.yml') }}-${{ env.DATE }}
+          key: ${{ runner.os }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-dev-env.yml') }}-${{ env.DATE }}
           restore-keys: |
-            ${{ env.RUN_STAMP }}-conda-pytest-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-dev-env.yml') }}-
+            ${{ runner.os }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-dev-env.yml') }}-
 
       - name: Update Conda env
-        if: steps.conda-cache.cache-hit != 'true'
+        if: steps.restore-conda-cache.outputs.cache-hit != 'true'
         run: |
           conda update conda
           conda env update -f omniscidb/scripts/mapd-deps-conda-dev-env.yml
 
       - name: Save Conda env cache
-        id: save-conda-cache
+        if: steps.restore-conda-cache.outputs.cache-hit != 'true'
         uses: actions/cache/save@v3
         with:
           path: |
             ${{ env.CONDA_ENV_PATH }}
-          key: ${{ env.RUN_STAMP }}-conda-pytest-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-dev-env.yml') }}-${{ env.DATE }}
+          key: ${{ runner.os }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-dev-env.yml') }}-${{ env.DATE }}
 
       - name: Restore Maven cache
         uses: actions/cache@v3
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b6cd73f55..b5999510f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           path: |
             ${{ env.CONDA_ENV_PATH }}
-          key: ${{ env.RUN_STAMP }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-dev-env.yml') }}-${{ inputs.cache-suffix }}
+          key: ${{ runner.os }}-conda-${{ hashFiles('omniscidb/scripts/mapd-deps-conda-dev-env.yml') }}-${{ inputs.cache-suffix }}
 
       - name: C++ style check
         if: inputs.test == 'style'