diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index ff6e51f19..f4436030a 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -29,7 +29,7 @@ jobs:
 
     steps:
     - name: Get current date as package key
-      id: pkg_key
+      id: cache_key
       run: echo "key=$(date +'%W')" >> $GITHUB_OUTPUT
       shell: bash
 
@@ -62,6 +62,7 @@ jobs:
       uses: xmake-io/github-action-setup-xmake@v1
       with:
         xmake-version: branch@dev
+        actions-cache-folder: .xmake-cache-W${{ steps.cache_key.outputs.key }}
 
     # Update xmake repository (in order to have the file that will be cached)
     - name: Update xmake repository
@@ -84,14 +85,14 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
-        key: Linux-${{ matrix.config.arch }}-coverage-${{ steps.dep_hash_linux.outputs.hash }}-W${{ steps.pkg_key.outputs.key }}
+        key: Linux-${{ matrix.config.arch }}-coverage-${{ steps.dep_hash_linux.outputs.hash }}-W${{ steps.cache_key.outputs.key }}
 
     - name: Retrieve cached xmake dependencies (Windows)
       if: runner.os == 'Windows'
       uses: actions/cache@v3
       with:
         path: ${{ env.XMAKE_GLOBALDIR }}\.xmake\packages
-        key: MSVC-${{ matrix.config.arch }}-coverage-${{ steps.dep_hash_windows.outputs.hash }}-W${{ steps.pkg_key.outputs.key }}
+        key: MSVC-${{ matrix.config.arch }}-coverage-${{ steps.dep_hash_windows.outputs.hash }}-W${{ steps.cache_key.outputs.key }}
 
     # Setup compilation mode and install project dependencies
     - name: Configure xmake and install dependencies
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 1271d545a..56bcb33b3 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -29,7 +29,7 @@ jobs:
 
     steps:
     - name: Get current date as package key
-      id: pkg_key
+      id: cache_key
       run: echo "key=$(date +'%W')" >> $GITHUB_OUTPUT
 
     - name: Checkout repository
@@ -50,6 +50,7 @@ jobs:
       uses: xmake-io/github-action-setup-xmake@v1
       with:
         xmake-version: branch@dev
+        actions-cache-folder: .xmake-cache-W${{ steps.cache_key.outputs.key }}
 
     # Update xmake repository (in order to have the file that will be cached)
     - name: Update xmake repository
@@ -65,7 +66,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
-        key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.pkg_key.outputs.key }}
+        key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.cache_key.outputs.key }}
 
     # Setup compilation mode and install project dependencies
     - name: Configure xmake and install dependencies
diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
index 0c5a5537c..955145e72 100644
--- a/.github/workflows/macos-build.yml
+++ b/.github/workflows/macos-build.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Get current date as package key
-      id: pkg_key
+      id: cache_key
       run: echo "key=$(date +'%W')" >> $GITHUB_OUTPUT
 
     - name: Checkout repository
@@ -43,6 +43,7 @@ jobs:
       uses: xmake-io/github-action-setup-xmake@v1
       with:
         xmake-version: branch@dev
+        actions-cache-folder: .xmake-cache-W${{ steps.cache_key.outputs.key }}
 
     # Update xmake repository (in order to have the file that will be cached)
     - name: Update xmake repository
@@ -58,7 +59,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
-        key: macOS-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.pkg_key.outputs.key }}
+        key: macOS-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.cache_key.outputs.key }}
 
     # Setup compilation mode and install project dependencies
     - name: Configure xmake and install dependencies
diff --git a/.github/workflows/msys2-build.yml b/.github/workflows/msys2-build.yml
index 5c73d2bc0..5cc7a4143 100644
--- a/.github/workflows/msys2-build.yml
+++ b/.github/workflows/msys2-build.yml
@@ -33,7 +33,7 @@ jobs:
 
     steps:
     - name: Get current date as package key
-      id: pkg_key
+      id: cache_key
       shell: bash
       run: echo "key=$(date +'%W')" >> $GITHUB_OUTPUT
 
@@ -57,7 +57,7 @@ jobs:
       id: xmake_cache
       with:
         path: ${{ github.workspace }}/xmake_git
-        key: MinGW-XMake-W${{ steps.pkg_key.outputs.key }}
+        key: MinGW-XMake-W${{ steps.cache_key.outputs.key }}
 
     # Build xmake
     - name: Setup xmake
@@ -88,7 +88,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages
-        key: MinGW-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.pkg_key.outputs.key }}
+        key: MinGW-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.cache_key.outputs.key }}
 
     # Setup compilation mode and install project dependencies
     - name: Configure xmake and install dependencies
diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
index f3b242cbd..36ce88e33 100644
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Get current date as package key
-      id: pkg_key
+      id: cache_key
       run: echo "key=$(date +'%W')" >> $GITHUB_OUTPUT
       shell: bash
 
@@ -59,7 +59,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ${{ env.XMAKE_GLOBALDIR }}\.xmake\packages
-        key: MSVC-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.pkg_key.outputs.key }}
+        key: MSVC-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.cache_key.outputs.key }}
 
     # Setup compilation mode and install project dependencies
     - name: Configure xmake and install dependencies