diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e313043..1f31a10 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.8", "3.12"]
-        go-version: ["1.20.12", "1.21.5"]
+        go-version: ["1.20.x", "1.21.x"]
         runs-on: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
@@ -39,6 +39,8 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
+          cache: false
+          check-latest: true
 
       - name: Install GCC on Linux
         if: matrix.runs-on == 'ubuntu-latest'
@@ -48,6 +50,12 @@ jobs:
         if: matrix.runs-on == 'windows-latest'
         run: choco install mingw
 
+      - name: Restore Hugo builder cache
+        uses: actions/cache@v3.3.2
+        with:
+          path: ./hugo_cache/
+          key: ${{ runner.os }}-${{ matrix.go-version }}-hugo-build-cache-${{ hashFiles('**/setup.py', '**/pyproject.toml') }}
+
       - name: Install Python dependencies
         run: python -m pip install build virtualenv nox