diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
index 60a6219..64d68a3 100644
--- a/.github/workflows/cibuildwheel.yml
+++ b/.github/workflows/cibuildwheel.yml
@@ -31,28 +31,17 @@ jobs:
         if: runner.os == 'Windows'
         uses: actions/cache@v4
         with:
-          path: C:\\vcpkg\\installed
+          path: |
+            C:\\vcpkg\\installed
+            C:\\vcpkg\\vcpkg.exe
+            C:\\vcpkg\\scripts
+            C:\\vcpkg\\triplets
           key: vcpkg-openblas-${{ runner.os }}
 
       - name: Install cibuildwheel
         run: python -m pip install --upgrade pip cibuildwheel
 
       - name: Build wheels
-        env:
-          CIBW_ENVIRONMENT_MACOS: EASYSBA_USE_ACCELERATE=1 EASYSBA_LAPACK_LIBS=
-          CIBW_BEFORE_ALL_WINDOWS: >-
-            if not exist C:\vcpkg\vcpkg.exe (
-              git clone https://github.com/microsoft/vcpkg.git C:\vcpkg &&
-              C:\vcpkg\bootstrap-vcpkg.bat -disableMetrics
-            ) &&
-            C:\vcpkg\vcpkg.exe install openblas:x64-windows
-          CIBW_ENVIRONMENT_WINDOWS: |
-            EASYSBA_LAPACK_LIBS=openblas
-            EASYSBA_INCLUDE_DIRS=C:\\vcpkg\\installed\\x64-windows\\include
-            EASYSBA_LIBRARY_DIRS=C:\\vcpkg\\installed\\x64-windows\\lib
-            INCLUDE=C:\\vcpkg\\installed\\x64-windows\\include
-            LIB=C:\\vcpkg\\installed\\x64-windows\\lib
-            PATH=C:\\vcpkg\\installed\\x64-windows\\bin;{PATH}
         run: python -m cibuildwheel --output-dir wheelhouse
 
       - name: Upload wheels
diff --git a/pyproject.toml b/pyproject.toml
index c9686db..d407bd5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,4 +23,15 @@ before-all = "yum -y install openblas-devel lapack-devel"
 environment = { EASYSBA_USE_ACCELERATE = "1", EASYSBA_LAPACK_LIBS = "" }
 
 [tool.cibuildwheel.windows]
-environment = { EASYSBA_LAPACK_LIBS = "openblas" }
+before-all = [
+    "if not exist C:\\vcpkg\\vcpkg.exe (git clone https://github.com/microsoft/vcpkg.git C:\\vcpkg && C:\\vcpkg\\bootstrap-vcpkg.bat -disableMetrics)",
+    "C:\\vcpkg\\vcpkg.exe install openblas:x64-windows",
+]
+
+[tool.cibuildwheel.windows.environment]
+EASYSBA_LAPACK_LIBS = "openblas"
+EASYSBA_INCLUDE_DIRS = "C:\\vcpkg\\installed\\x64-windows\\include"
+EASYSBA_LIBRARY_DIRS = "C:\\vcpkg\\installed\\x64-windows\\lib"
+INCLUDE = "C:\\vcpkg\\installed\\x64-windows\\include"
+LIB = "C:\\vcpkg\\installed\\x64-windows\\lib"
+PATH = "C:\\vcpkg\\installed\\x64-windows\\bin;{PATH}"