diff --git a/scripts/build_with_cache.sh b/scripts/build_with_cache.sh
index 2ab40a6..93bad3e 100755
--- a/scripts/build_with_cache.sh
+++ b/scripts/build_with_cache.sh
@@ -475,7 +475,7 @@ run_build_with_optional_late_host_restore() {
   build_status=$?
   set -e
 
-  if [ "$build_status" -eq "$late_restore_exit_code" ] && [ -f "$late_restore_status_file" ]; then
+  if [ -f "$late_restore_status_file" ]; then
     if restore_cache; then
       late_restore_hit=true
       return 0
diff --git a/scripts/tests/test_build_cache.sh b/scripts/tests/test_build_cache.sh
index 264ff3f..aaf1ee1 100755
--- a/scripts/tests/test_build_cache.sh
+++ b/scripts/tests/test_build_cache.sh
@@ -85,7 +85,9 @@ mkdir -p artifacts
 bk_fetch_source "${BK_TEST_SOURCE_REPO}" autosrc main
 cd autosrc
 ./configure
-make "$system"
+if ! make "$system" > make.log 2>&1; then
+  exit 1
+fi
 EOF
 chmod +x "${TMP_DIR}/project/programs/autotoolapp/build.sh"