diff --git a/3rdParty/assimp/CMakeLists.txt b/3rdParty/assimp/CMakeLists.txt
index 782c75b..bad2bad 100644
--- a/3rdParty/assimp/CMakeLists.txt
+++ b/3rdParty/assimp/CMakeLists.txt
@@ -7,7 +7,7 @@ if (NOT IOS)
 endif ()
 if (assimp_FOUND OR ASSIMP_FOUND)
     message("Using system assimp")
-elseif (ENABLE_ASSIMP)
+elseif (ENABLE_ASSIMP AND NOT assimp_BUILT)
     message("Building assimp from sources")
     if(NOT DEFINED ASSIMP_REPO)
         set(ASSIMP_REPO https://github.com/assimp/assimp.git)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a82edd..545b7ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,15 @@
 cmake_minimum_required(VERSION 3.28 FATAL_ERROR)
 
+if (EXISTS "${CMAKE_CURRENT_BINARY_DIR}/cmake_checks_cache.txt")
+    FILE(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/cmake_checks_cache.txt")
+endif()
+
+if (NOT ONCE)
+    set(PATCH_CMD git apply --ignore-space-change --ignore-whitespace ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake-checks-cache-patch.patch)
+    execute_process(COMMAND ${PATCH_CMD} WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake-checks-cache")
+    set(ONCE ON CACHE INTERNAL "")
+endif()
+
 if ("${PLATFORM}" STREQUAL "OS64" OR "${PLATFORM}" STREQUAL "OS64COMBINED")
     set(ENABLE_ARC OFF)
     set(DEPLOYMENT_TARGET "14.0")
diff --git a/cmake/cmake-checks-cache-patch.patch b/cmake/cmake-checks-cache-patch.patch
new file mode 100644
index 0000000..2d9b39e
--- /dev/null
+++ b/cmake/cmake-checks-cache-patch.patch
@@ -0,0 +1,22 @@
+ CMakeChecksCache/CheckTypeSize.cmake | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/CMakeChecksCache/CheckTypeSize.cmake b/CMakeChecksCache/CheckTypeSize.cmake
+index ee56b64..49bf66a 100644
+--- a/CMakeChecksCache/CheckTypeSize.cmake
++++ b/CMakeChecksCache/CheckTypeSize.cmake
+@@ -20,12 +20,11 @@
+ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ # SOFTWARE.
+ 
++include(${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
+ include_guard(GLOBAL)
+-
+ cmake_minimum_required(VERSION 3.11)
+ 
+ include(DumpCMakeVariables)
+-include(${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
+ 
+ macro(check_type_size type variable)
+     _check_type_size(${type} ${variable})
+