diff --git a/cmaked/CMakeDetermineDCompiler.cmake b/cmaked/CMakeDetermineDCompiler.cmake
index 9937036..19b5467 100644
--- a/cmaked/CMakeDetermineDCompiler.cmake
+++ b/cmaked/CMakeDetermineDCompiler.cmake
@@ -116,10 +116,12 @@ IF(NOT CMAKE_D_COMPILER_ID_RUN)
   FILE(READ ${CMAKE_PLATFORM_ID_CONTENT_FILE} CMAKE_D_COMPILER_ID_PLATFORM_CONTENT)
   INCLUDE(${CMAKE_ROOT}/Modules/CMakeDetermineCompilerId.cmake)
   # Workaround for bug http://public.kitware.com/Bug/view.php?id=14481
-  FIND_FILE(CMAKE_COMPILER_ID_FILE_IN CMakeDCompilerId.d.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH})
-  FILE(RELATIVE_PATH CMAKE_COMPILER_ID_FILE_IN_RELATIVE ${CMAKE_ROOT}/Modules ${CMAKE_COMPILER_ID_FILE_IN})
-  STRING(REGEX REPLACE "[.]in$" "" CMAKE_COMPILER_ID_FILE_RELATIVE ${CMAKE_COMPILER_ID_FILE_IN_RELATIVE})
+  FIND_FILE(CMAKE_D_COMPILER_ID_FILE_IN CMakeDCompilerId.d.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH})
+  FILE(RELATIVE_PATH CMAKE_D_COMPILER_ID_FILE_IN_RELATIVE ${CMAKE_ROOT}/Modules ${CMAKE_D_COMPILER_ID_FILE_IN})
+  STRING(REGEX REPLACE "[.]in$" "" CMAKE_COMPILER_ID_FILE_RELATIVE ${CMAKE_D_COMPILER_ID_FILE_IN_RELATIVE})
   CMAKE_DETERMINE_COMPILER_ID(D DFLAGS ${CMAKE_COMPILER_ID_FILE_RELATIVE})
+  UNSET(CMAKE_D_COMPILER_ID_FILE_IN CACHE)
+  UNSET(CMAKE_PLATFORM_ID_CONTENT_FILE CACHE)
 
   # Set old compiler and platform id variables.
   IF("${CMAKE_D_COMPILER_ID}" MATCHES "GNU")
@@ -132,9 +134,6 @@ IF(NOT CMAKE_D_COMPILER_ID_RUN)
   ENDIF("${CMAKE_D_PLATFORM_ID}" MATCHES "MinGW")
 ENDIF(NOT CMAKE_D_COMPILER_ID_RUN)
 
-
-
-
 INCLUDE(CMakeFindBinUtils)
 IF(MSVC_D_ARCHITECTURE_ID)
   SET(SET_MSVC_D_ARCHITECTURE_ID
diff --git a/cmaked/CMakeTestDCompiler.cmake b/cmaked/CMakeTestDCompiler.cmake
index f0c21f7..71956db 100644
--- a/cmaked/CMakeTestDCompiler.cmake
+++ b/cmaked/CMakeTestDCompiler.cmake
@@ -71,6 +71,7 @@ ELSE(NOT CMAKE_D_COMPILER_WORKS)
       @ONLY IMMEDIATE # IMMEDIATE must be here for compatibility mode <= 2.0
       )
     INCLUDE(${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeDCompiler.cmake)
+    UNSET(CMAKE_D_COMPILER_ABI_SRC CACHE)
+    UNSET(CMAKE_D_COMPILER_CMAKE_IN CACHE)
   ENDIF(CMAKE_D_COMPILER_FORCED)
 ENDIF(NOT CMAKE_D_COMPILER_WORKS)
-