diff --git a/.github/actions/cache-submodules/action.yml b/.github/actions/cache-submodules/action.yml
index ce0bad1..cee587a 100644
--- a/.github/actions/cache-submodules/action.yml
+++ b/.github/actions/cache-submodules/action.yml
@@ -29,7 +29,9 @@ runs:
       uses: actions/cache@v3
       id: cache
       with:
-        path: addons/godot_xterm/native/thirdparty
+        path: |
+          addons/godot_xterm/native/thirdparty/libuv
+          addons/godot_xterm/native/thirdparty/node-pty
         key: thirdparty-${{ inputs.platform }}-${{ inputs.arch }}-${{ inputs.target }}-${{ steps.hash.outputs.hash }}-${{ steps.hash.outputs.build-files-hash }}
         restore-keys: |
           thirdparty-${{ inputs.platform }}-${{ inputs.arch }}-${{ inputs.target }}-${{ steps.hash.outputs.hash }}-
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 20017c9..4052ae8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -234,13 +234,14 @@ jobs:
           path: docs/demo
 
   test:
-    name: Test (${{ matrix.platform }}, ${{ matrix.arch }}, debug)
+    name: Test (${{ matrix.platform }}, ${{ matrix.arch }}, ${{ matrix.godot-version }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         platform: [linux, macos, windows]
         arch: [x86_64, x86_32, universal]
+        godot-version: ["v4.2-stable", "v4.2.1-stable"]
         exclude:
           - platform: linux
             arch: universal
@@ -262,7 +263,7 @@ jobs:
       - name: Setup Godot
         uses: lihop/setup-godot@v2
         with:
-          version: "4.2.1-stable"
+          version: ${{ matrix.godot-version }}
       - name: Macos setup
         if: ${{ matrix.platform == 'macos' }}
         run: |
@@ -299,9 +300,16 @@ jobs:
         shell: bash
         run: |
           if [ "${{ matrix.platform }}" = "windows" ]; then
-            just test
+            just test | tee output.log
           else
-            just test-all
+            just test-all | tee output.log
+          fi
+
+          # This step often passes when it shouldn't, due to GUT not failing on script errors
+          # (see: https://github.com/bitwes/Gut/issues/210). Therefore, we check the output
+          # for expected (and unexpected) strings.
+          if 'SCRIPT_ERROR:' output.log; then
+            exit 1
           fi
 
   merge-artifacts:
diff --git a/addons/godot_xterm/godot_xterm.gdextension b/addons/godot_xterm/godot_xterm.gdextension
deleted file mode 100644
index fd19c36..0000000
--- a/addons/godot_xterm/godot_xterm.gdextension
+++ /dev/null
@@ -1,11 +0,0 @@
-[configuration]
-
-entry_symbol = "godot_xterm_library_init"
-compatibility_minimum = "4.2.1"
-
-[libraries]
-
-linux.debug.x86_64 = "res://addons/godot_xterm/native/bin/libgodot-xterm.linux.template_debug.x86_64.so"
-linux.release.x86_64 = "res://addons/godot_xterm/native/bin/libgodot-xterm.linux.template_release.x86_64.so"
-linux.debug.x86_32 = "res://addons/godot_xterm/native/bin/libgodot-xterm.linux.template_debug.x86_32.so"
-linux.release.x86_32 = "res://addons/godot_xterm/native/bin/libgodot-xterm.linux.template_release.x86_32.so"
diff --git a/addons/godot_xterm/native/bin/godot-xterm.gdextension b/addons/godot_xterm/native/godot-xterm.gdextension
similarity index 97%
rename from addons/godot_xterm/native/bin/godot-xterm.gdextension
rename to addons/godot_xterm/native/godot-xterm.gdextension
index 4e704b1..8260bd0 100644
--- a/addons/godot_xterm/native/bin/godot-xterm.gdextension
+++ b/addons/godot_xterm/native/godot-xterm.gdextension
@@ -1,7 +1,7 @@
 [configuration]
 
 entry_symbol = "godot_xterm_library_init"
-compatibility_minimum = "4.2.1"
+compatibility_minimum = "4.2.0"
 
 [libraries]
 
diff --git a/addons/godot_xterm/native/thirdparty/godot-cpp b/addons/godot_xterm/native/thirdparty/godot-cpp
index 78ffea5..54136ee 160000
--- a/addons/godot_xterm/native/thirdparty/godot-cpp
+++ b/addons/godot_xterm/native/thirdparty/godot-cpp
@@ -1 +1 @@
-Subproject commit 78ffea5b136f3178c31cddb28f6b963ceaa89420
+Subproject commit 54136ee8357c5140a3775c54f08db5f7deda2058
diff --git a/docs/README.md b/docs/README.md
index c6c15fd..dc685dd 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -4,7 +4,7 @@
 
 <br/>
 
-[![Godot Version](https://img.shields.io/badge/Godot-3.4.x-blue.svg)](#supported-godot-versions)
+[![Godot Version](https://img.shields.io/badge/Godot-4.2+-blue.svg)](#supported-godot-versions)
 [![License](https://img.shields.io/badge/License-MIT-green.svg)](https://github.com/lihop/godot-xterm/blob/stable/LICENSE.md)
 [![Build and Test](https://github.com/lihop/godot-xterm/actions/workflows/main.yml/badge.svg?event=schedule)](https://github.com/lihop/godot-xterm/actions/workflows/main.yml)