diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 4de7719..60a8d20 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,4 +1,4 @@
-name: 🐧 Linux Builds
+name: 🤖 Android Builds
 on:
   push:
     branches: [ master, github_actions ]
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index bab0f20..7b5ac43 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -13,8 +13,18 @@ env:
 jobs:
   linux-editor:
     runs-on: "ubuntu-20.04"
-    name: Ubuntu
-
+    name: ${{ matrix.name }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Editor (target=editor)
+            cache-name: linux-editor-cache
+            target: editor
+
+          - name: Template (target=template_release)
+            cache-name: ubuntu-template
+            target: template_release
 
     steps:
       # Clone Godot
@@ -77,7 +87,7 @@ jobs:
 
       # Upload cache on completion and check it out now
       - name: Load .scons_cache directory
-        id: linux-editor-cache
+        id: ${{ matrix.cache-name }}
         uses: actions/cache@v2
         with:
           path: ${{github.workspace}}/.scons_cache/
@@ -112,14 +122,9 @@ jobs:
           SCONS_CACHE: ${{github.workspace}}/.scons_cache/
         run: |
           PATH=${GITHUB_WORKSPACE}/x86_64-godot-linux-gnu_sdk-buildroot/bin:$PATH
-          scons
+          scons target=${{ matrix.target }}
 
-      - name: Compilation
-        env:
-          SCONS_CACHE: ${{github.workspace}}/.scons_cache/
-        run: |
-          PATH=${GITHUB_WORKSPACE}/x86_64-godot-linux-gnu_sdk-buildroot/bin:$PATH
-          scons target=template_release
+      
 
       - name: Prepare artifact
         run: |
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index da9f978..bb2286b 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -49,11 +49,16 @@ jobs:
 
 
 
-      - name: Setup Godot build cache
-        uses: ./.github/actions/godot-cache
+      - name: Load .scons_cache directory
+        id: mac-editor-cache${{ matrix.name }}
+        uses: actions/cache@v2
         with:
-          cache-name: ${{ matrix.cache-name }}
-        continue-on-error: true
+          path: ${{github.workspace}}/.scons_cache/
+          key: ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
+          restore-keys: |
+            ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
+            ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
+            ${{github.job}}-${{env.GODOT_BASE_BRANCH}}
 
       - name: Setup python and scons
         uses: ./.github/actions/godot-deps
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index c0907ab..00559e5 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -16,7 +16,18 @@ jobs:
   windows-editor:
     # Windows 10 with latest image
     runs-on: "windows-latest"
-    name: win32
+    name: ${{ matrix.name }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Editor (target=editor, tests=yes)
+            cache-name: win-editor-cache
+            target: editor
+
+          - name: Template (target=template_release)
+            cache-name: win-template
+            target: template_release
 
     steps:
       # Clone Godot
@@ -47,7 +58,7 @@ jobs:
       # Upload cache on completion and check it out now
       # Editing this is pretty dangerous for Windows since it can break and needs to be properly tested with a fresh cache.
       - name: Load .scons_cache directory
-        id: windows-editor-cache
+        id: ${{ matrix.name }}
         #uses: ${{matrix.cache_action}}
         uses: actions/cache@v2
         with:
@@ -82,7 +93,8 @@ jobs:
         env:
           SCONS_CACHE: /.scons_cache/
         run: |
-          scons
+          scons target=${{ matrix.target }}
+          
 
       # Make build available
       - uses: actions/upload-artifact@v2
diff --git a/SCsub b/SCsub
index 63dea55..e9afd34 100644
--- a/SCsub
+++ b/SCsub
@@ -19,12 +19,12 @@ if(env["PLATFORM"] != "win32"):
 
     
     
+    env_rwkv.Append(CCFLAGS=['-fexceptions'])
     
     # add -march=avx512
     print(env["platform"])
     if env["platform"] == "linuxbsd":
         print("Using linuxbsd")
-        env_rwkv.Append(CCFLAGS=['-fexceptions'])
         # add -O3
         env_rwkv.Append(CCFLAGS=['-O3'])
         # add -march=avx512