diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
index 7adebe48fa..3d5a9553d2 100644
--- a/.github/workflows/ci-test.yml
+++ b/.github/workflows/ci-test.yml
@@ -89,13 +89,11 @@ jobs:
       # In case this is second attempt try restoring failed tests
       - name: Restore the previous failed combine result
         if: steps.run_result.outputs.run_result == 'failedtest'
-        uses: martijnhols/actions-cache/restore@v3
+        uses: actions/cache@v3
         with:
           path: |
             ~/combined_failed_spec_ci
           key: ${{ github.run_id }}-"ci-test-result"
-          restore-keys: |
-            ${{ github.run_id }}-${{ github.job }}
             
       # failed_spec_env will contain list of all failed specs
       # We are using environment variable instead of regular to support multiline
diff --git a/.github/workflows/integration-tests-command.yml b/.github/workflows/integration-tests-command.yml
index 5dd76d5c5c..dddf1c86d9 100644
--- a/.github/workflows/integration-tests-command.yml
+++ b/.github/workflows/integration-tests-command.yml
@@ -109,7 +109,7 @@ jobs:
 
       # Download failed_spec list for all jobs
       - uses: actions/download-artifact@v3
-        if: needs.ci-test.result
+        if: needs.ci-test.result != 'success'
         id: download_ci
         with:
           name: failed-spec-ci
@@ -133,13 +133,11 @@ jobs:
       # Force save the CI failed spec list into a cache
       - name: Store the combined run result for CI
         if: needs.ci-test.result != 'success'
-        uses: martijnhols/actions-cache/save@v3
+        uses: actions/cache@v3
         with:
           path: |
             ~/combined_failed_spec_ci
           key: ${{ github.run_id }}-"ci-test-result"
-          restore-keys: |
-            ${{ github.run_id }}-${{ github.job }}
             
       # Upload combined failed CI spec list to a file
       # This is done for debugging.
diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml
index 5915ab4de9..bcfab56e0a 100644
--- a/.github/workflows/test-build-docker-image.yml
+++ b/.github/workflows/test-build-docker-image.yml
@@ -90,7 +90,7 @@ jobs:
 
       # Download failed_spec_ci list for all CI container jobs
       - uses: actions/download-artifact@v3
-        if: needs.ci-test.result
+        if: needs.ci-test.result != 'success'
         id: download_ci
         with:
           name: failed-spec-ci
@@ -114,13 +114,11 @@ jobs:
       # Force save the CI failed spec list into a cache
       - name: Store the combined run result for CI
         if: needs.ci-test.result != 'success'
-        uses: martijnhols/actions-cache/save@v3
+        uses: actions/cache@v3
         with:
           path: |
             ~/combined_failed_spec_ci
           key: ${{ github.run_id }}-"ci-test-result"
-          restore-keys: |
-            ${{ github.run_id }}-${{ github.job }}
 
       # Upload combined failed CI spec list to a file
       # This is done for debugging.