diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3313dbb37..9f8206030 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -106,6 +106,12 @@ jobs:
         vcpkg integrate install
         msbuild /maxCpuCount /warnAsError /property:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}} /target:NAS2D
 
+    - name: Save build cache - NAS2D
+      uses: actions/cache/save@v4
+      with:
+        path: nas2d-core/.build/
+        key: nas2dCache-${{ runner.os }}-${{ matrix.platform }}-${{ env.nas2dSha }}
+
     - name: Build OPHD
       # Add additional options to the MSBuild command line here (like platform or verbosity level).
       # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
@@ -113,7 +119,7 @@ jobs:
         vcpkg integrate install
         msbuild /maxCpuCount /warnAsError /property:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
 
-    - name: Save incremental build cache
+    - name: Save incremental build cache - OPHD
       uses: actions/cache/save@v4
       with:
         path: .build