diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b4472d9abe..82e6b90624 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -52,6 +52,15 @@ jobs:
             -DCMAKE_PREFIX_PATH=${{ github.workspace }}/deps/srcs/bde-tools/BdeBuildSystem \
             -DCMAKE_INSTALL_LIBDIR=lib64
           cmake --build build/blazingmq --parallel 8 --target all all.t
+      - name: Run C++ Unit Tests
+        run: |
+          cd ${{ github.workspace }}/build/blazingmq
+          ctest -E mwcsys_executil.t --output-on-failure
+      - name: Clean-up build directories before caching
+        run: |
+          find . -name "*.o" -type f -delete
+          find . -name "*.a" -type f -delete
+          find . -name "*.t.tsk" -type f -delete
       - uses: actions/cache@v4
         with:
           path: |
@@ -82,10 +91,6 @@ jobs:
           src/python/bin/schemagen
           src/python/bin/tweakgen
           pytest src/python
-      - name: Run C++ Unit Tests
-        run: |
-          cd ${{ github.workspace }}/build/blazingmq
-          ctest -E mwcsys_executil.t --output-on-failure
 
   integration_tests_ubuntu:
     name: BlazingMQ integration tests