diff --git a/CMakeChecksCache/CheckCCompilerFlag.cmake b/CMakeChecksCache/CheckCCompilerFlag.cmake
index ac9d22e..d889d47 100644
--- a/CMakeChecksCache/CheckCCompilerFlag.cmake
+++ b/CMakeChecksCache/CheckCCompilerFlag.cmake
@@ -1,6 +1,6 @@
 # MIT License
 
-# Copyright (c) 2017 Cristian Adam
+# Copyright (c) 2017-2018 Cristian Adam
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,50 +20,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-cmake_minimum_required(VERSION 3.4.3)
+include_guard(GLOBAL)
 
-set(cache_file ${CMAKE_CHECKS_CACHE_FILE})
-if(NOT cache_file)
-    set(cache_file ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt)
-endif()
+cmake_minimum_required(VERSION 3.11)
 
-# Include the content of CheckCCompilerFlag just not to have the original
-# include(CheckCSourceCompiles) which has precedence, and which doesn't have
-# a include guard, thus overriding my overriden version
-
-include(${CMAKE_CURRENT_LIST_DIR}/CheckCSourceCompiles.cmake)
-include(CMakeCheckCompilerFlagCommonPatterns)
-
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-macro (CHECK_C_COMPILER_FLAG_original _FLAG _RESULT)
-   set(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
-   set(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
-
-   # Normalize locale during test compilation.
-   set(_CheckCCompilerFlag_LOCALE_VARS LC_ALL LC_MESSAGES LANG)
-   foreach(v ${_CheckCCompilerFlag_LOCALE_VARS})
-     set(_CheckCCompilerFlag_SAVED_${v} "$ENV{${v}}")
-     set(ENV{${v}} C)
-   endforeach()
-   CHECK_COMPILER_FLAG_COMMON_PATTERNS(_CheckCCompilerFlag_COMMON_PATTERNS)
-   _check_c_source_compiles("int main(void) { return 0; }" ${_RESULT}
-     # Some compilers do not fail with a bad flag
-     FAIL_REGEX "command line option .* is valid for .* but not for C" # GNU
-     ${_CheckCCompilerFlag_COMMON_PATTERNS}
-     )
-   foreach(v ${_CheckCCompilerFlag_LOCALE_VARS})
-     set(ENV{${v}} ${_CheckCCompilerFlag_SAVED_${v}})
-     unset(_CheckCCompilerFlag_SAVED_${v})
-   endforeach()
-   unset(_CheckCCompilerFlag_LOCALE_VARS)
-   unset(_CheckCCompilerFlag_COMMON_PATTERNS)
-
-   set (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
-endmacro ()
+include(DumpCMakeVariables)
+include(${CMAKE_ROOT}/Modules/CheckCCompilerFlag.cmake)
 
 macro(check_c_compiler_flag flag variable)
-    CHECK_C_COMPILER_FLAG_original("${flag}" ${variable})
-    file(APPEND ${cache_file} "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Test ${flag}\")\n")
+    _check_c_compiler_flag("${flag}" ${variable})
+    file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Test ${variable}\")\n")
 endmacro()
diff --git a/CMakeChecksCache/CheckCSourceCompiles.cmake b/CMakeChecksCache/CheckCSourceCompiles.cmake
index 06383f8..10c70cf 100644
--- a/CMakeChecksCache/CheckCSourceCompiles.cmake
+++ b/CMakeChecksCache/CheckCSourceCompiles.cmake
@@ -1,6 +1,6 @@
 # MIT License
 
-# Copyright (c) 2017 Cristian Adam
+# Copyright (c) 2017-2018 Cristian Adam
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,19 +20,18 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-cmake_minimum_required(VERSION 3.4.3)
+include_guard(GLOBAL)
 
-set(cache_file ${CMAKE_CHECKS_CACHE_FILE})
-if(NOT cache_file)
-    set(cache_file ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt)
-endif()
+cmake_minimum_required(VERSION 3.11)
 
+include(DumpCMakeVariables)
 include(${CMAKE_ROOT}/Modules/CheckCSourceCompiles.cmake)
+
 macro(check_c_source_compiles source variable)
-    if(NOT DEFINED "${VAR}")
+    if(NOT DEFINED "${variable}")
         _check_c_source_compiles("${source}" ${variable})
     else()
         _check_c_source_compiles("${source}" ${variable} "${ARGN}")
     endif()
-    file(APPEND ${cache_file} "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Test ${header}\")\n")
+    file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Test ${variable}\")\n")
 endmacro()
diff --git a/CMakeChecksCache/CheckCXXCompilerFlag.cmake b/CMakeChecksCache/CheckCXXCompilerFlag.cmake
index bc8b800..a092b0d 100644
--- a/CMakeChecksCache/CheckCXXCompilerFlag.cmake
+++ b/CMakeChecksCache/CheckCXXCompilerFlag.cmake
@@ -1,6 +1,6 @@
 # MIT License
 
-# Copyright (c) 2017 Cristian Adam
+# Copyright (c) 2017-2018 Cristian Adam
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,50 +20,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-cmake_minimum_required(VERSION 3.4.3)
+include_guard(GLOBAL)
 
-set(cache_file ${CMAKE_CHECKS_CACHE_FILE})
-if(NOT cache_file)
-    set(cache_file ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt)
-endif()
+cmake_minimum_required(VERSION 3.11)
 
-# Include the content of CheckCXXCompilerFlag just not to have the original
-# include(CheckCXXSourceCompiles) which has precedence, and which doesn't have
-# a include guard, thus overriding my overriden version
-
-include(${CMAKE_CURRENT_LIST_DIR}/CheckCXXSourceCompiles.cmake)
-include(CMakeCheckCompilerFlagCommonPatterns)
-
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-macro (CHECK_CXX_COMPILER_FLAG_original _FLAG _RESULT)
-   set(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
-   set(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
-
-   # Normalize locale during test compilation.
-   set(_CheckCXXCompilerFlag_LOCALE_VARS LC_ALL LC_MESSAGES LANG)
-   foreach(v ${_CheckCXXCompilerFlag_LOCALE_VARS})
-     set(_CheckCXXCompilerFlag_SAVED_${v} "$ENV{${v}}")
-     set(ENV{${v}} C)
-   endforeach()
-   CHECK_COMPILER_FLAG_COMMON_PATTERNS(_CheckCXXCompilerFlag_COMMON_PATTERNS)
-   _check_cxx_source_compiles("int main() { return 0; }" ${_RESULT}
-     # Some compilers do not fail with a bad flag
-     FAIL_REGEX "command line option .* is valid for .* but not for C\\\\+\\\\+" # GNU
-     ${_CheckCXXCompilerFlag_COMMON_PATTERNS}
-     )
-   foreach(v ${_CheckCXXCompilerFlag_LOCALE_VARS})
-     set(ENV{${v}} ${_CheckCXXCompilerFlag_SAVED_${v}})
-     unset(_CheckCXXCompilerFlag_SAVED_${v})
-   endforeach()
-   unset(_CheckCXXCompilerFlag_LOCALE_VARS)
-   unset(_CheckCXXCompilerFlag_COMMON_PATTERNS)
-
-   set (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
-endmacro ()
+include(DumpCMakeVariables)
+include(${CMAKE_ROOT}/Modules/CheckCXXCompilerFlag.cmake)
 
 macro(check_cxx_compiler_flag flag variable)
-    CHECK_CXX_COMPILER_FLAG_original("${flag}" ${variable})
-    file(APPEND ${cache_file} "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Test ${flag}\")\n")
+    _check_cxx_compiler_flag("${flag}" ${variable})
+    file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Test ${variable}\")\n")
 endmacro()
diff --git a/CMakeChecksCache/CheckCXXSourceCompiles.cmake b/CMakeChecksCache/CheckCXXSourceCompiles.cmake
index 2acac8d..6f718eb 100644
--- a/CMakeChecksCache/CheckCXXSourceCompiles.cmake
+++ b/CMakeChecksCache/CheckCXXSourceCompiles.cmake
@@ -1,6 +1,6 @@
 # MIT License
 
-# Copyright (c) 2017 Cristian Adam
+# Copyright (c) 2017-2018 Cristian Adam
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,19 +20,18 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-cmake_minimum_required(VERSION 3.4.3)
+include_guard(GLOBAL)
 
-set(cache_file ${CMAKE_CHECKS_CACHE_FILE})
-if(NOT cache_file)
-    set(cache_file ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt)
-endif()
+cmake_minimum_required(VERSION 3.11)
 
+include(DumpCMakeVariables)
 include(${CMAKE_ROOT}/Modules/CheckCXXSourceCompiles.cmake)
+
 macro(check_cxx_source_compiles source variable)
-    if(NOT DEFINED "${VAR}")
+    if(NOT DEFINED "${variable}")
         _check_cxx_source_compiles("${source}" ${variable})
     else()
         _check_cxx_source_compiles("${source}" ${variable} "${ARGN}")
     endif()
-    file(APPEND ${cache_file} "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Test ${variable}\")\n")
+    file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Test ${variable}\")\n")
 endmacro()
diff --git a/CMakeChecksCache/CheckFunctionExists.cmake b/CMakeChecksCache/CheckFunctionExists.cmake
index 90dab39..f583df6 100644
--- a/CMakeChecksCache/CheckFunctionExists.cmake
+++ b/CMakeChecksCache/CheckFunctionExists.cmake
@@ -1,6 +1,6 @@
 # MIT License
 
-# Copyright (c) 2017 Cristian Adam
+# Copyright (c) 2017-2018 Cristian Adam
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-cmake_minimum_required(VERSION 3.4.3)
+include_guard(GLOBAL)
 
-set(cache_file ${CMAKE_CHECKS_CACHE_FILE})
-if(NOT cache_file)
-    set(cache_file ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt)
-endif()
+cmake_minimum_required(VERSION 3.11)
 
+include(DumpCMakeVariables)
 include(${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
+
 macro(check_function_exists function variable)
     _check_function_exists(${function} ${variable})
-    file(APPEND ${cache_file} "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Have function ${function}\")\n")
+    file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Have function ${function}\")\n")
 endmacro()
diff --git a/CMakeChecksCache/CheckIncludeFile.cmake b/CMakeChecksCache/CheckIncludeFile.cmake
index 206bda4..0b330ae 100644
--- a/CMakeChecksCache/CheckIncludeFile.cmake
+++ b/CMakeChecksCache/CheckIncludeFile.cmake
@@ -1,6 +1,6 @@
 # MIT License
 
-# Copyright (c) 2017 Cristian Adam
+# Copyright (c) 2017-2018 Cristian Adam
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-cmake_minimum_required(VERSION 3.4.3)
+include_guard(GLOBAL)
 
-set(cache_file ${CMAKE_CHECKS_CACHE_FILE})
-if(NOT cache_file)
-    set(cache_file ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt)
-endif()
+cmake_minimum_required(VERSION 3.11)
 
+include(DumpCMakeVariables)
 include(${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
+
 macro(check_include_file header variable)
     _check_include_file(${header} ${variable})
-    file(APPEND ${cache_file} "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Have include ${header}\")\n")
+    file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Have include ${header}\")\n")
 endmacro()
diff --git a/CMakeChecksCache/CheckIncludeFileCXX.cmake b/CMakeChecksCache/CheckIncludeFileCXX.cmake
index e0707a8..a2b8921 100644
--- a/CMakeChecksCache/CheckIncludeFileCXX.cmake
+++ b/CMakeChecksCache/CheckIncludeFileCXX.cmake
@@ -1,6 +1,6 @@
 # MIT License
 
-# Copyright (c) 2017 Cristian Adam
+# Copyright (c) 2017-2018 Cristian Adam
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-cmake_minimum_required(VERSION 3.4.3)
+include_guard(GLOBAL)
 
-set(cache_file ${CMAKE_CHECKS_CACHE_FILE})
-if(NOT cache_file)
-    set(cache_file ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt)
-endif()
+cmake_minimum_required(VERSION 3.11)
 
+include(DumpCMakeVariables)
 include(${CMAKE_ROOT}/Modules/CheckIncludeFileCXX.cmake)
+
 macro(check_include_file_cxx header variable)
     _check_include_file_cxx(${header} ${variable})
-    file(APPEND ${cache_file} "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Have include ${header}\")\n")
+    file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Have include ${header}\")\n")
 endmacro()
diff --git a/CMakeChecksCache/CheckIncludeFiles.cmake b/CMakeChecksCache/CheckIncludeFiles.cmake
new file mode 100644
index 0000000..52a2b77
--- /dev/null
+++ b/CMakeChecksCache/CheckIncludeFiles.cmake
@@ -0,0 +1,37 @@
+# MIT License
+
+# Copyright (c) 2018 Cristian Adam
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+include_guard(GLOBAL)
+
+cmake_minimum_required(VERSION 3.11)
+
+include(DumpCMakeVariables)
+include(${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake)
+
+macro(check_include_files headers variable)
+    if(NOT DEFINED "${variable}")
+        _check_include_files("${headers}" ${variable})
+    else()
+        _check_include_files("${headers}" ${variable} "${ARGN}")
+    endif()
+    file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Have include ${headers}\")\n")
+endmacro()
diff --git a/CMakeChecksCache/CheckLibraryExists.cmake b/CMakeChecksCache/CheckLibraryExists.cmake
index 86bb68b..1889725 100644
--- a/CMakeChecksCache/CheckLibraryExists.cmake
+++ b/CMakeChecksCache/CheckLibraryExists.cmake
@@ -1,6 +1,6 @@
 # MIT License
 
-# Copyright (c) 2017 Cristian Adam
+# Copyright (c) 2017-2018 Cristian Adam
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-cmake_minimum_required(VERSION 3.4.3)
+include_guard(GLOBAL)
 
-set(cache_file ${CMAKE_CHECKS_CACHE_FILE})
-if(NOT cache_file)
-    set(cache_file ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt)
-endif()
+cmake_minimum_required(VERSION 3.11)
 
+include(DumpCMakeVariables)
 include(${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
+
 macro(check_library_exists library function location variable)
-    _check_library_exists(${library} ${function} "${location}" ${variable})
-    file(APPEND ${cache_file} "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Have library ${library}\")\n")
+    _check_library_exists("${library}" ${function} "${location}" ${variable})
+    file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Have library ${library}\")\n")
 endmacro()
diff --git a/CMakeChecksCache/CheckSymbolExists.cmake b/CMakeChecksCache/CheckSymbolExists.cmake
index 8540055..53e732f 100644
--- a/CMakeChecksCache/CheckSymbolExists.cmake
+++ b/CMakeChecksCache/CheckSymbolExists.cmake
@@ -1,6 +1,6 @@
 # MIT License
 
-# Copyright (c) 2017 Cristian Adam
+# Copyright (c) 2017-2018 Cristian Adam
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,92 +20,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-cmake_minimum_required(VERSION 3.4.3)
+include_guard(GLOBAL)
 
-set(cache_file ${CMAKE_CHECKS_CACHE_FILE})
-if(NOT cache_file)
-    set(cache_file ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt)
-endif()
+cmake_minimum_required(VERSION 3.11)
 
-# Found a bug in cmake, they already have a _check_symbol_exists implementation macro o_O
-# include(${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake)
-
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-macro(official_check_symbol_exists SYMBOL FILES VARIABLE)
-  if(CMAKE_C_COMPILER_LOADED)
-    official_check_symbol_exists_impl("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.c" "${SYMBOL}" "${FILES}" "${VARIABLE}" )
-  elseif(CMAKE_CXX_COMPILER_LOADED)
-    official_check_symbol_exists_impl("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" "${SYMBOL}" "${FILES}" "${VARIABLE}" )
-  else()
-    message(FATAL_ERROR "CHECK_SYMBOL_EXISTS needs either C or CXX language enabled")
-  endif()
-endmacro()
-
-macro(official_check_symbol_exists_impl SOURCEFILE SYMBOL FILES VARIABLE)
-  if(NOT DEFINED "${VARIABLE}" OR "x${${VARIABLE}}" STREQUAL "x${VARIABLE}")
-    set(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n")
-    set(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS})
-    if(CMAKE_REQUIRED_LIBRARIES)
-      set(CHECK_SYMBOL_EXISTS_LIBS
-        LINK_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-    else()
-      set(CHECK_SYMBOL_EXISTS_LIBS)
-    endif()
-    if(CMAKE_REQUIRED_INCLUDES)
-      set(CMAKE_SYMBOL_EXISTS_INCLUDES
-        "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
-    else()
-      set(CMAKE_SYMBOL_EXISTS_INCLUDES)
-    endif()
-    foreach(FILE ${FILES})
-      string(APPEND CMAKE_CONFIGURABLE_FILE_CONTENT
-        "#include <${FILE}>\n")
-    endforeach()
-    string(APPEND CMAKE_CONFIGURABLE_FILE_CONTENT
-      "\nint main(int argc, char** argv)\n{\n  (void)argv;\n#ifndef ${SYMBOL}\n  return ((int*)(&${SYMBOL}))[argc];\n#else\n  (void)argc;\n  return 0;\n#endif\n}\n")
-
-    configure_file("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in"
-      "${SOURCEFILE}" @ONLY)
-
-    if(NOT CMAKE_REQUIRED_QUIET)
-      message(STATUS "Looking for ${SYMBOL}")
-    endif()
-    try_compile(${VARIABLE}
-      ${CMAKE_BINARY_DIR}
-      "${SOURCEFILE}"
-      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
-      ${CHECK_SYMBOL_EXISTS_LIBS}
-      CMAKE_FLAGS
-      -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_SYMBOL_EXISTS_FLAGS}
-      "${CMAKE_SYMBOL_EXISTS_INCLUDES}"
-      OUTPUT_VARIABLE OUTPUT)
-    if(${VARIABLE})
-      if(NOT CMAKE_REQUIRED_QUIET)
-        message(STATUS "Looking for ${SYMBOL} - found")
-      endif()
-      set(${VARIABLE} 1 CACHE INTERNAL "Have symbol ${SYMBOL}")
-      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-        "Determining if the ${SYMBOL} "
-        "exist passed with the following output:\n"
-        "${OUTPUT}\nFile ${SOURCEFILE}:\n"
-        "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
-    else()
-      if(NOT CMAKE_REQUIRED_QUIET)
-        message(STATUS "Looking for ${SYMBOL} - not found")
-      endif()
-      set(${VARIABLE} "" CACHE INTERNAL "Have symbol ${SYMBOL}")
-      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-        "Determining if the ${SYMBOL} "
-        "exist failed with the following output:\n"
-        "${OUTPUT}\nFile ${SOURCEFILE}:\n"
-        "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
-    endif()
-  endif()
-endmacro()
+include(DumpCMakeVariables)
+include(${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake)
 
 macro(check_symbol_exists symbol header variable)
-    official_check_symbol_exists(${symbol} "${header}" ${variable})
-    file(APPEND ${cache_file} "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Have symbol ${symbol}\")\n")
+    _check_symbol_exists(${symbol} "${header}" ${variable})
+    file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "set(${variable} \"${${variable}}\" CACHE INTERNAL \"Have symbol ${symbol}\")\n")
 endmacro()
diff --git a/CMakeChecksCache/CheckTypeSize.cmake b/CMakeChecksCache/CheckTypeSize.cmake
index ee5af6b..b3c002c 100644
--- a/CMakeChecksCache/CheckTypeSize.cmake
+++ b/CMakeChecksCache/CheckTypeSize.cmake
@@ -1,6 +1,6 @@
 # MIT License
 
-# Copyright (c) 2017 Cristian Adam
+# Copyright (c) 2017-2018 Cristian Adam
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,15 +20,19 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-cmake_minimum_required(VERSION 3.4.3)
+include_guard(GLOBAL)
 
-set(cache_file ${CMAKE_CHECKS_CACHE_FILE})
-if(NOT cache_file)
-    set(cache_file ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt)
-endif()
+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})
-    file(APPEND ${cache_file} "set(${variable} \"${${variable}}\" CACHE INTERNAL \"CHECK_TYPE_SIZE: sizeof(${type})\")\n")
+    file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "set(HAVE_${variable} \"${HAVE_${variable}}\" CACHE INTERNAL \"Result of TRY_COMPILE\")\n")
+    if(HAVE_${variable})
+      file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "set(${variable} \"${${variable}}\" CACHE INTERNAL \"CHECK_TYPE_SIZE: sizeof(${type})\")\n")
+    else()
+      file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "set(${variable} \"\" CACHE INTERNAL \"CHECK_TYPE_SIZE: ${type} unknown\")\n")
+    endif()
 endmacro()
diff --git a/CMakeChecksCache/DumpCMakeVariables.cmake b/CMakeChecksCache/DumpCMakeVariables.cmake
new file mode 100644
index 0000000..dc70fdd
--- /dev/null
+++ b/CMakeChecksCache/DumpCMakeVariables.cmake
@@ -0,0 +1,45 @@
+# MIT License
+
+# Copyright (c) 2018 Cristian Adam
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+include_guard(GLOBAL)
+
+cmake_minimum_required(VERSION 3.11)
+
+file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "###############################################################\n")
+file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "# Dump of all cache variables that started with CMAKE_*\n")
+file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "###############################################################\n")
+
+get_cmake_property(_cachedVariableNames CACHE_VARIABLES)
+list(FILTER _cachedVariableNames INCLUDE REGEX "^CMAKE_.*$")
+foreach (_cacheVariable ${_cachedVariableNames})
+    get_property(_type CACHE "${_cacheVariable}" PROPERTY TYPE)
+    get_property(_advanced CACHE "${_cacheVariable}" PROPERTY ADVANCED)
+    get_property(_help_string CACHE "${_cacheVariable}" PROPERTY HELPSTRING)
+    if (NOT "${_type}" STREQUAL "UNINITIALIZED" AND NOT "${_type}" STREQUAL "STATIC")
+        file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "set(${_cacheVariable} \"${${_cacheVariable}}\" CACHE ${_type} \"${_help_string}\")\n")
+        if (${_advanced})
+            file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "mark_as_advanced(${_cacheVariable})\n")
+        endif()
+    endif()
+endforeach()
+
+file(APPEND ${CMAKE_BINARY_DIR}/cmake_checks_cache.txt "###############################################################\n")
diff --git a/CMakeChecksCache/FindThreads.cmake b/CMakeChecksCache/FindThreads.cmake
deleted file mode 100644
index 020b98d..0000000
--- a/CMakeChecksCache/FindThreads.cmake
+++ /dev/null
@@ -1,224 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#.rst:
-# FindThreads
-# -----------
-#
-# This module determines the thread library of the system.
-#
-# The following variables are set
-#
-# ::
-#
-#   CMAKE_THREAD_LIBS_INIT     - the thread library
-#   CMAKE_USE_SPROC_INIT       - are we using sproc?
-#   CMAKE_USE_WIN32_THREADS_INIT - using WIN32 threads?
-#   CMAKE_USE_PTHREADS_INIT    - are we using pthreads
-#   CMAKE_HP_PTHREADS_INIT     - are we using hp pthreads
-#
-# The following import target is created
-#
-# ::
-#
-#   Threads::Threads
-#
-# For systems with multiple thread libraries, caller can set
-#
-# ::
-#
-#   CMAKE_THREAD_PREFER_PTHREAD
-#
-# If the use of the -pthread compiler and linker flag is preferred then the
-# caller can set
-#
-# ::
-#
-#   THREADS_PREFER_PTHREAD_FLAG
-#
-# Please note that the compiler flag can only be used with the imported
-# target. Use of both the imported target as well as this switch is highly
-# recommended for new code.
-
-include (CheckLibraryExists)
-include (CheckSymbolExists)
-set(Threads_FOUND FALSE)
-set(CMAKE_REQUIRED_QUIET_SAVE ${CMAKE_REQUIRED_QUIET})
-set(CMAKE_REQUIRED_QUIET ${Threads_FIND_QUIETLY})
-
-if(CMAKE_C_COMPILER_LOADED)
-  include (CheckIncludeFile)
-elseif(CMAKE_CXX_COMPILER_LOADED)
-  include (CheckIncludeFileCXX)
-else()
-  message(FATAL_ERROR "FindThreads only works if either C or CXX language is enabled")
-endif()
-
-# Do we have sproc?
-if(CMAKE_SYSTEM_NAME MATCHES IRIX AND NOT CMAKE_THREAD_PREFER_PTHREAD)
-  include (CheckIncludeFiles)
-  CHECK_INCLUDE_FILES("sys/types.h;sys/prctl.h"  CMAKE_HAVE_SPROC_H)
-endif()
-
-# Internal helper macro.
-# Do NOT even think about using it outside of this file!
-macro(_check_threads_lib LIBNAME FUNCNAME VARNAME)
-  if(NOT Threads_FOUND)
-     CHECK_LIBRARY_EXISTS(${LIBNAME} ${FUNCNAME} "" ${VARNAME})
-     if(${VARNAME})
-       set(CMAKE_THREAD_LIBS_INIT "-l${LIBNAME}")
-       set(CMAKE_HAVE_THREADS_LIBRARY 1)
-       set(Threads_FOUND TRUE)
-     endif()
-  endif ()
-endmacro()
-
-# Internal helper macro.
-# Do NOT even think about using it outside of this file!
-macro(_check_pthreads_flag)
-  if(NOT Threads_FOUND)
-    # If we did not found -lpthread, -lpthread, or -lthread, look for -pthread
-    if(NOT DEFINED THREADS_HAVE_PTHREAD_ARG)
-      message(STATUS "Check if compiler accepts -pthread")
-      if(CMAKE_C_COMPILER_LOADED)
-        set(_threads_src ${CMAKE_CURRENT_LIST_DIR}/CheckForPthreads.c)
-      elseif(CMAKE_CXX_COMPILER_LOADED)
-        set(_threads_src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/FindThreads/CheckForPthreads.cxx)
-        configure_file(${CMAKE_CURRENT_LIST_DIR}/CheckForPthreads.c "${_threads_src}" COPYONLY)
-      endif()
-      try_run(THREADS_PTHREAD_ARG THREADS_HAVE_PTHREAD_ARG
-        ${CMAKE_BINARY_DIR}
-        ${_threads_src}
-        CMAKE_FLAGS -DLINK_LIBRARIES:STRING=-pthread
-        COMPILE_OUTPUT_VARIABLE OUTPUT)
-      unset(_threads_src)
-
-      if(THREADS_HAVE_PTHREAD_ARG)
-        if(THREADS_PTHREAD_ARG STREQUAL "2")
-          set(Threads_FOUND TRUE)
-          message(STATUS "Check if compiler accepts -pthread - yes")
-        else()
-          message(STATUS "Check if compiler accepts -pthread - no")
-          file(APPEND
-            ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-            "Determining if compiler accepts -pthread returned ${THREADS_PTHREAD_ARG} instead of 2. The compiler had the following output:\n${OUTPUT}\n\n")
-        endif()
-      else()
-        message(STATUS "Check if compiler accepts -pthread - no")
-        file(APPEND
-          ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-          "Determining if compiler accepts -pthread failed with the following output:\n${OUTPUT}\n\n")
-      endif()
-
-    endif()
-
-    if(THREADS_HAVE_PTHREAD_ARG)
-      set(Threads_FOUND TRUE)
-      set(CMAKE_THREAD_LIBS_INIT "-pthread")
-    endif()
-  endif()
-endmacro()
-
-if(CMAKE_HAVE_SPROC_H AND NOT CMAKE_THREAD_PREFER_PTHREAD)
-  # We have sproc
-  set(CMAKE_USE_SPROC_INIT 1)
-else()
-  # Do we have pthreads?
-  if(CMAKE_C_COMPILER_LOADED)
-    CHECK_INCLUDE_FILE("pthread.h" CMAKE_HAVE_PTHREAD_H)
-  else()
-    CHECK_INCLUDE_FILE_CXX("pthread.h" CMAKE_HAVE_PTHREAD_H)
-  endif()
-  if(CMAKE_HAVE_PTHREAD_H)
-
-    #
-    # We have pthread.h
-    # Let's check for the library now.
-    #
-    set(CMAKE_HAVE_THREADS_LIBRARY)
-    if(NOT THREADS_HAVE_PTHREAD_ARG)
-      # Check if pthread functions are in normal C library
-      CHECK_SYMBOL_EXISTS(pthread_create pthread.h CMAKE_HAVE_LIBC_CREATE)
-      if(CMAKE_HAVE_LIBC_CREATE)
-        set(CMAKE_THREAD_LIBS_INIT "")
-        set(CMAKE_HAVE_THREADS_LIBRARY 1)
-        set(Threads_FOUND TRUE)
-      else()
-
-        # Check for -pthread first if enabled. This is the recommended
-        # way, but not backwards compatible as one must also pass -pthread
-        # as compiler flag then.
-        if (THREADS_PREFER_PTHREAD_FLAG)
-           _check_pthreads_flag()
-        endif ()
-
-        _check_threads_lib(pthreads pthread_create CMAKE_HAVE_PTHREADS_CREATE)
-        _check_threads_lib(pthread  pthread_create CMAKE_HAVE_PTHREAD_CREATE)
-        if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-            # On sun also check for -lthread
-            _check_threads_lib(thread thr_create CMAKE_HAVE_THR_CREATE)
-        endif()
-      endif()
-    endif()
-
-    _check_pthreads_flag()
-  endif()
-endif()
-
-if(CMAKE_THREAD_LIBS_INIT OR CMAKE_HAVE_LIBC_CREATE)
-  set(CMAKE_USE_PTHREADS_INIT 1)
-  set(Threads_FOUND TRUE)
-endif()
-
-if(CMAKE_SYSTEM_NAME MATCHES "Windows")
-  set(CMAKE_USE_WIN32_THREADS_INIT 1)
-  set(Threads_FOUND TRUE)
-endif()
-
-if(CMAKE_USE_PTHREADS_INIT)
-  if(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
-    # Use libcma if it exists and can be used.  It provides more
-    # symbols than the plain pthread library.  CMA threads
-    # have actually been deprecated:
-    #   http://docs.hp.com/en/B3920-90091/ch12s03.html#d0e11395
-    #   http://docs.hp.com/en/947/d8.html
-    # but we need to maintain compatibility here.
-    # The CMAKE_HP_PTHREADS setting actually indicates whether CMA threads
-    # are available.
-    CHECK_LIBRARY_EXISTS(cma pthread_attr_create "" CMAKE_HAVE_HP_CMA)
-    if(CMAKE_HAVE_HP_CMA)
-      set(CMAKE_THREAD_LIBS_INIT "-lcma")
-      set(CMAKE_HP_PTHREADS_INIT 1)
-      set(Threads_FOUND TRUE)
-    endif()
-    set(CMAKE_USE_PTHREADS_INIT 1)
-  endif()
-
-  if(CMAKE_SYSTEM MATCHES "OSF1-V")
-    set(CMAKE_USE_PTHREADS_INIT 0)
-    set(CMAKE_THREAD_LIBS_INIT )
-  endif()
-
-  if(CMAKE_SYSTEM MATCHES "CYGWIN_NT")
-    set(CMAKE_USE_PTHREADS_INIT 1)
-    set(Threads_FOUND TRUE)
-    set(CMAKE_THREAD_LIBS_INIT )
-    set(CMAKE_USE_WIN32_THREADS_INIT 0)
-  endif()
-endif()
-
-set(CMAKE_REQUIRED_QUIET ${CMAKE_REQUIRED_QUIET_SAVE})
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Threads DEFAULT_MSG Threads_FOUND)
-
-if(THREADS_FOUND AND NOT TARGET Threads::Threads)
-  add_library(Threads::Threads INTERFACE IMPORTED)
-
-  if(THREADS_HAVE_PTHREAD_ARG)
-    set_property(TARGET Threads::Threads PROPERTY INTERFACE_COMPILE_OPTIONS "-pthread")
-  endif()
-
-  if(CMAKE_THREAD_LIBS_INIT)
-    set_property(TARGET Threads::Threads PROPERTY INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
-  endif()
-endif()