diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index 7db785e..ea5ef3d 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -14,11 +14,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Clang
-      uses: egor-tensin/setup-clang@v1
+    - name: Cache LLVM and Clang
+      id: cache-llvm
+      uses: actions/cache@v3
+      with:
+        path: |
+          C:/Program Files/LLVM
+          ./llvm
+        key: llvm-3.5
+    - name: Install LLVM and Clang
+      uses: KyleMayes/install-llvm-action@v1
       with:
         version: latest
-        platform: x64
+        cached: ${{ steps.cache-llvm.outputs.cache-hit }}
     - name: Setup NASM
       uses: ilammy/setup-nasm@v1
     - name: Set up Python
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index d0cd8dc..b1840e7 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -14,11 +14,19 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Clang
-      uses: egor-tensin/setup-clang@v1
+    - name: Cache LLVM and Clang
+      id: cache-llvm
+      uses: actions/cache@v3
+      with:
+        path: |
+          C:/Program Files/LLVM
+          ./llvm
+        key: llvm-3.5
+    - name: Install LLVM and Clang
+      uses: KyleMayes/install-llvm-action@v1
       with:
         version: latest
-        platform: x64
+        cached: ${{ steps.cache-llvm.outputs.cache-hit }}
     - name: Setup NASM
       uses: ilammy/setup-nasm@v1
     - name: Set up Python