diff --git a/.scripts/build.sh b/.scripts/build.sh
index c16fcd9..095deff 100755
--- a/.scripts/build.sh
+++ b/.scripts/build.sh
@@ -8,6 +8,9 @@ set -o pipefail
 
 # Create a patched apfs.efi
 cd "${HOME}/src/edk2/Clover/CloverPackage/CloverV2/drivers-Off"
+wget "https://github.com/Dids/Build_Clover/raw/work/Files/apfs.efi" -O "apfs_new.efi"
+cp -f apfs_new.efi drivers64/apfs-64.efi
+cp -f apfs_new.efi drivers64UEFI/apfs.efi
 cp -f drivers64/apfs-64.efi drivers64/apfs_patched-64.efi
 cp -f drivers64UEFI/apfs.efi drivers64UEFI/apfs_patched.efi
 perl -i -pe 's|\x00\x74\x07\xb8\xff\xff|\x00\x90\x90\xb8\xff\xff|sg' drivers64/apfs_patched-64.efi
diff --git a/.travis.yml b/.travis.yml
index 1668169..72af91d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,18 +2,19 @@
 os: osx
 osx_image: xcode9.1
 
+## NOTE: Caching is disabled for now, to avoid build issues with edk2 updates etc.
 # Configure caching
-before_cache:
-  - cp -f $HOME/src/edk2/Clover/CloverPackage/sym/Clover_*.* $TRAVIS_BUILD_DIR/
-  - rm -rf $TRAVIS_BUILD_DIR/*.zip
-  - rm -rf $HOME/src/edk2/Build
-  - rm -rf $HOME/src/edk2/Clover/CloverPackage/sym
-  - rm -rf $HOME/src/edk2/Clover/CloverPackage/CloverPrefpane/build
-  - rm -rf $HOME/src/edk2/Clover/CloverPackage/CloverUpdater/build
-cache:
-  timeout: 300000 # 5 minutes
-  directories:
-    - $HOME/src
+#before_cache:
+#  - cp -f $HOME/src/edk2/Clover/CloverPackage/sym/Clover_*.* $TRAVIS_BUILD_DIR/
+#  - rm -rf $TRAVIS_BUILD_DIR/*.zip
+#  - rm -rf $HOME/src/edk2/Build
+#  - rm -rf $HOME/src/edk2/Clover/CloverPackage/sym
+#  - rm -rf $HOME/src/edk2/Clover/CloverPackage/CloverPrefpane/build
+#  - rm -rf $HOME/src/edk2/Clover/CloverPackage/CloverUpdater/build
+#cache:
+#  timeout: 300000 # 5 minutes
+#  directories:
+#    - $HOME/src
 
 # Install dependencies
 install: