diff --git a/.github/composite-actions/dump-restore-util/action.yml b/.github/composite-actions/dump-restore-util/action.yml
index a6e31df7d9f..cfe9dd5580f 100644
--- a/.github/composite-actions/dump-restore-util/action.yml
+++ b/.github/composite-actions/dump-restore-util/action.yml
@@ -328,7 +328,7 @@ runs:
       shell: bash
 
     - name: Save cache
-      if: always()
+      if: always() && steps.run-pg_dump-restore.outcome == 'success'
       uses: ./.github/composite-actions/save-cacche
 
     - name: Run Verify Tests
diff --git a/.github/composite-actions/minor-version-upgrade-util/action.yml b/.github/composite-actions/minor-version-upgrade-util/action.yml
index e023c333f4f..66767d0452a 100644
--- a/.github/composite-actions/minor-version-upgrade-util/action.yml
+++ b/.github/composite-actions/minor-version-upgrade-util/action.yml
@@ -49,9 +49,9 @@ runs:
         extension_branch: ${{ inputs.extension_branch }}
 
     - name: Save cache
-      if: always() && steps.build-extensions-newer.outcome == 'success'
+      if: always() && steps.build-extensions-newer == 'success'
       uses: ./.github/composite-actions/save-ccache
-    
+
     # Not created and used composite action update-extensions here since, in the previous step it has 
     # checked out a branch/tag which may not have the updated update-extension composite action
     - name: Update extensions
diff --git a/.github/composite-actions/setup-base-version/action.yml b/.github/composite-actions/setup-base-version/action.yml
index a861aed0c25..c960a5ddedd 100644
--- a/.github/composite-actions/setup-base-version/action.yml
+++ b/.github/composite-actions/setup-base-version/action.yml
@@ -223,7 +223,7 @@ runs:
     - uses: actions/checkout@v2
 
     - name: Save cache
-      if: always()
+      if: always()&& steps.jdbc-upgrade-tests.outcome == 'success'
       uses: ./.github/composite-actions/save-ccache
     
     - name: Install Python
diff --git a/.github/composite-actions/setup-new-version/action.yml b/.github/composite-actions/setup-new-version/action.yml
index 8b5e4b78fc8..ac43ac6ba6f 100644
--- a/.github/composite-actions/setup-new-version/action.yml
+++ b/.github/composite-actions/setup-new-version/action.yml
@@ -65,7 +65,7 @@ runs:
         install_dir: ${{ inputs.pg_new_dir }}
 
     - name: Save cache
-      if: always()
+      if: always() && steps.build-postgis-extension.outcome == 'success'
       uses: ./.github/composite-actions/save-ccache
       
     - name: Setup new data directory
diff --git a/.github/workflows/dotnet-tests.yml b/.github/workflows/dotnet-tests.yml
index cee67208089..898854acd22 100644
--- a/.github/workflows/dotnet-tests.yml
+++ b/.github/workflows/dotnet-tests.yml
@@ -42,7 +42,7 @@ jobs:
         uses: ./.github/composite-actions/install-extensions
       
       - name: Save cache
-        if: always()
+        if: always()&& steps.install-extensions.outcome == 'success'
         uses: ./.github/composite-actions/save-ccache
 
       - name: Run Dotnet Tests
diff --git a/.github/workflows/jdbc-tests-single-db-mode.yml b/.github/workflows/jdbc-tests-single-db-mode.yml
index d8af3fdb63f..eb36a0d9d24 100644
--- a/.github/workflows/jdbc-tests-single-db-mode.yml
+++ b/.github/workflows/jdbc-tests-single-db-mode.yml
@@ -103,7 +103,7 @@ jobs:
             ~/psql/data_5433/logfile
 
       - name: Save cache
-        if: always()
+        if: always() && steps.replication.outcome == 'success'
         uses: ./.github/composite-actions/save-ccache
 
       # The test summary files contain paths with ':' characters, which is not allowed with the upload-artifact actions
diff --git a/.github/workflows/major-version-upgrade.yml b/.github/workflows/major-version-upgrade.yml
index bde5fe85b28..728ab4aa4de 100644
--- a/.github/workflows/major-version-upgrade.yml
+++ b/.github/workflows/major-version-upgrade.yml
@@ -124,7 +124,7 @@ jobs:
       - uses: actions/checkout@v2
       
       - name: Save cache
-        if: always()
+        if: always()&& steps.install-extensions-old.outcome == 'success'
         uses: ./.github/composite-actions/save-ccache
 
       - name: Build Modified Postgres using latest version
@@ -171,7 +171,7 @@ jobs:
           install_dir: ${{env.NEW_INSTALL_DIR}}
       
       - name: Save cache
-        if: always()
+        if: always()&& steps.build-postgis-extension.outcome == 'success'
         uses: ./.github/composite-actions/save-ccache
         
       - name: Setup new data directory
diff --git a/.github/workflows/minor-version-upgrade.yml b/.github/workflows/minor-version-upgrade.yml
index 7b92c213ab8..23dda2ff1c8 100644
--- a/.github/workflows/minor-version-upgrade.yml
+++ b/.github/workflows/minor-version-upgrade.yml
@@ -114,7 +114,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Save cache
-        if: always()
+        if: always() && steps.install-extensions-older.outcome == 'success'
         uses: ./.github/composite-actions/save-ccache
 
       - name: Build and run tests for Postgres engine using latest engine