diff --git a/cmake/BuildMariaDBConnector.cmake b/cmake/BuildMariaDBConnector.cmake
index d35b4cfd2..71c125aec 100644
--- a/cmake/BuildMariaDBConnector.cmake
+++ b/cmake/BuildMariaDBConnector.cmake
@@ -20,13 +20,13 @@ ExternalProject_Add(connector-c
   BINARY_DIR ${CMAKE_BINARY_DIR}/connector-c
   INSTALL_DIR ${CMAKE_BINARY_DIR}/connector-c/install)
 
-set(MARIADB_CONNECTOR_FOUND TRUE CACHE INTERNAL "" FORCE)
-set(MARIADB_CONNECTOR_STATIC_FOUND TRUE CACHE INTERNAL "" FORCE)
+set(MARIADB_CONNECTOR_FOUND TRUE CACHE INTERNAL "")
+set(MARIADB_CONNECTOR_STATIC_FOUND TRUE CACHE INTERNAL "")
 set(MARIADB_CONNECTOR_INCLUDE_DIR
-  ${CMAKE_BINARY_DIR}/connector-c/install/include/mariadb CACHE INTERNAL "" FORCE)
+  ${CMAKE_BINARY_DIR}/connector-c/install/include/mariadb CACHE INTERNAL "")
 set(MARIADB_CONNECTOR_STATIC_LIBRARIES
   ${CMAKE_BINARY_DIR}/connector-c/install/lib/mariadb/libmariadbclient.a
-  CACHE INTERNAL "" FORCE)
+  CACHE INTERNAL "")
 set(MARIADB_CONNECTOR_LIBRARIES
   ${CMAKE_BINARY_DIR}/connector-c/install/lib/mariadb/libmariadbclient.a
-  CACHE INTERNAL "" FORCE)
+  CACHE INTERNAL "")
diff --git a/cmake/FindMariaDBConnector.cmake b/cmake/FindMariaDBConnector.cmake
index 31d9e1e24..a967c400b 100644
--- a/cmake/FindMariaDBConnector.cmake
+++ b/cmake/FindMariaDBConnector.cmake
@@ -40,6 +40,11 @@ endif()
 
 if(HAVE_MARIADB_CONNECTOR)
   message(STATUS "Found MariaDB Connector-C")
+  set(MARIADB_CONNECTOR_FOUND TRUE CACHE INTERNAL "" FORCE)
 else()
-  set(MARIADB_CONNECTOR_FOUND FALSE CACHE INTERNAL "" FORCE)
+  unset(MARIADB_CONNECTOR_FOUND)
+  unset(MARIADB_CONNECTOR_STATIC_FOUND)
+  unset(MARIADB_CONNECTOR_LIBRARIES)
+  unset(MARIADB_CONNECTOR_STATIC_LIBRARIES)
+  unset(MARIADB_CONNECTOR_INCLUDE_DIR)
 endif()