diff --git a/storage/ndb/src/ndbapi/ClusterMgr.cpp b/storage/ndb/src/ndbapi/ClusterMgr.cpp
index b108ed3fd41..63fdb73c49f 100644
--- a/storage/ndb/src/ndbapi/ClusterMgr.cpp
+++ b/storage/ndb/src/ndbapi/ClusterMgr.cpp
@@ -38,6 +38,7 @@
 #include <mgmapi_config_parameters.h>
 
 int global_flag_send_heartbeat_now= 0;
+int global_flag_skip_invalidate_cache = 0;
 
 // Just a C wrapper for threadMain
 extern "C" 
@@ -458,11 +459,14 @@ ClusterMgr::reportNodeFailed(NodeId nodeId){
   theNode.nfCompleteRep = false;
   if(noOfAliveNodes == 0)
   {
-    theFacade.m_globalDictCache.lock();
-    theFacade.m_globalDictCache.invalidate_all();
-    theFacade.m_globalDictCache.unlock();
-    m_connect_count ++;
-    m_cluster_state = CS_waiting_for_clean_cache;
+    if (!global_flag_skip_invalidate_cache)
+    {
+      theFacade.m_globalDictCache.lock();
+      theFacade.m_globalDictCache.invalidate_all();
+      theFacade.m_globalDictCache.unlock();
+      m_connect_count ++;
+      m_cluster_state = CS_waiting_for_clean_cache;
+    }
     NFCompleteRep rep;
     for(Uint32 i = 1; i<MAX_NODES; i++){
       if(theNodes[i].defined && theNodes[i].nfCompleteRep == false){
diff --git a/storage/ndb/test/src/NDBT_Test.cpp b/storage/ndb/test/src/NDBT_Test.cpp
index 1d21a0d1756..5bec0607255 100644
--- a/storage/ndb/test/src/NDBT_Test.cpp
+++ b/storage/ndb/test/src/NDBT_Test.cpp
@@ -1149,6 +1149,8 @@ static struct my_option my_long_options[] =
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
+extern int global_flag_skip_invalidate_cache;
+
 static void usage()
 {
   ndb_std_print_version();
@@ -1236,6 +1238,8 @@ int NDBT_TestSuite::execute(int argc, const char** argv){
   ndbout_c("random seed: %u", opt_seed);
   srand(opt_seed);
   srandom(opt_seed);
+
+  global_flag_skip_invalidate_cache = 1;
   
   {
     Ndb ndb(&con, "TEST_DB");