diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 8d8c993c4b..df56eb4683 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -332,12 +332,15 @@ jobs:
           key: v1-${{ runner.os }}-${{ matrix.build_type }}-pg-${{ steps.pg_v16_rev.outputs.pg_rev }}-${{ hashFiles('Makefile') }}
 
       - name: Build postgres v14
+        if: steps.cache_pg_14.outputs.cache-hit != 'true'
         run: mold -run make postgres-v14 -j$(nproc)
 
       - name: Build postgres v15
+        if: steps.cache_pg_15.outputs.cache-hit != 'true'
         run: mold -run make postgres-v15 -j$(nproc)
 
       - name: Build postgres v16
+        if: steps.cache_pg_16.outputs.cache-hit != 'true'
         run: mold -run make postgres-v16 -j$(nproc)
 
       - name: Build neon extensions
diff --git a/Makefile b/Makefile
index 19459a3211..e0c2bf36de 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ ifeq ($(BUILD_TYPE),release)
 else ifeq ($(BUILD_TYPE),debug)
 	PG_CONFIGURE_OPTS = --enable-debug --with-openssl --enable-cassert --enable-depend
 	PG_CFLAGS = -O0 -g3 $(CFLAGS)
-	CPPFLAGS = -fsanitize=address -fsanitize=undefined -fno-sanitize-recover -fno-sanitize=alignment -Wno-cast-function-type-strict
+	CPPFLAGS = -fsanitize=address -fsanitize=undefined -fno-sanitize-recover -fno-sanitize-alignment -Wno-cast-function-type-strict
 	LDFLAGS = -fsanitize=address -fsanitize=undefined -export-dynamic
 	LD_PRELOAD=$(gcc -print-file-name=libasan.so)
 else