diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c
index 8c8afc8d8882332069e4e007c533abad4135f6cc..c04765b0651f59066dd5897f2eaf0924b7113a21 100644
--- a/src/client/src/tscSystem.c
+++ b/src/client/src/tscSystem.c
@@ -199,10 +199,7 @@ void taos_init_imp(void) {
 
   // In the APIs of other program language, taos_cleanup is not available yet.
   // So, to make sure taos_cleanup will be invoked to clean up the allocated resource to suppress the valgrind warning.
-  // But in the dll, the child thread will be killed before atexit takes effect.So taos_cleanup is not necessary.
-#if !defined(TD_WINDOWS)
   atexit(taos_cleanup);
-#endif
 
   tscDebug("client is initialized successfully");
 }
diff --git a/src/util/src/tcache.c b/src/util/src/tcache.c
index 69b3741e13c9e0b3ee00615a29851a3f690a1e84..aaa1d5ba9ea5eff91ce2853f6bb29a9204a66e1c 100644
--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
@@ -537,7 +537,8 @@ void taosCacheCleanup(SCacheObj *pCacheObj) {
   pCacheObj->deleting = 1;
 
   // wait for the refresh thread quit before destroying the cache object.
-  while(atomic_load_8(&pCacheObj->deleting) != 0) {
+  // But in the dll, the child thread will be killed before atexit takes effect.So here we only wait for one second.
+  for (int i = 0; i < 20&&atomic_load_8(&pCacheObj->deleting) != 0; i++) {
     taosMsleep(50);
   }