diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index a42d075c3f..9628265007 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -252,7 +252,6 @@ void cmState::AddCacheEntry(const std::string& key, const char* value,
 {
   this->CMakeInstance->GetCacheManager()->AddCacheEntry(key, value,
                                                         helpString, type);
-  this->CMakeInstance->UnwatchUnusedCli(key);
 }
 
 void cmState::RemoveCacheEntry(std::string const& key)
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 69a3f03194..b90ac6943b 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1644,6 +1644,7 @@ void cmake::AddCacheEntry(const std::string& key, const char* value,
   this->State->AddCacheEntry(key, value,
                                     helpString,
                                     cmState::CacheEntryType(type));
+  this->UnwatchUnusedCli(key);
 }
 
 const char* cmake::GetCacheDefinition(const std::string& name) const