diff --git a/event/src/main/java/com/zfoo/event/manager/EventBus.java b/event/src/main/java/com/zfoo/event/manager/EventBus.java
index b4a70a5f..619f9851 100644
--- a/event/src/main/java/com/zfoo/event/manager/EventBus.java
+++ b/event/src/main/java/com/zfoo/event/manager/EventBus.java
@@ -93,7 +93,7 @@ public abstract class EventBus {
             thread.setUncaughtExceptionHandler((t, e) -> logger.error(t.toString(), e));
             var executor = executors[poolNumber];
             AssertionUtils.notNull(executor);
-            ThreadUtils.registerExecutor(thread.getId(), executor);
+            ThreadUtils.registerSingleThreadExecutor(thread, executor);
             return thread;
         }
     }
diff --git a/net/src/main/java/com/zfoo/net/task/TaskBus.java b/net/src/main/java/com/zfoo/net/task/TaskBus.java
index 0ef5a281..7cc82478 100644
--- a/net/src/main/java/com/zfoo/net/task/TaskBus.java
+++ b/net/src/main/java/com/zfoo/net/task/TaskBus.java
@@ -86,7 +86,7 @@ public final class TaskBus {
             thread.setUncaughtExceptionHandler((t, e) -> logger.error(t.toString(), e));
             var executor = executors[poolNumber];
             AssertionUtils.notNull(executor);
-            ThreadUtils.registerExecutor(thread.getId(), executor);
+            ThreadUtils.registerSingleThreadExecutor(thread, executor);
             return thread;
         }
     }
diff --git a/orm/src/main/java/com/zfoo/orm/cache/IEntityCache.java b/orm/src/main/java/com/zfoo/orm/cache/IEntityCache.java
index 5815d388..55024837 100644
--- a/orm/src/main/java/com/zfoo/orm/cache/IEntityCache.java
+++ b/orm/src/main/java/com/zfoo/orm/cache/IEntityCache.java
@@ -24,8 +24,8 @@ import java.util.function.BiConsumer;
 public interface IEntityCache<PK extends Comparable<PK>, E extends IEntity<PK>> {
 
     /**
-     * EN: Load data from the database to the cache and return a default value with an empty ID if the database does not exist.
-     * CN: 从数据库中加载数据到缓存，如果数据库不存在则返回一个id为空的默认值。
+     * EN: Load data from the database to the cache and return null if the database does not exist.
+     * CN: 从数据库中加载数据到缓存，如果数据库不存在则返回null。
      */
     @Nullable
     E load(PK pk);
diff --git a/orm/src/main/java/com/zfoo/orm/util/MongoIdUtils.java b/orm/src/main/java/com/zfoo/orm/util/MongoIdUtils.java
index 21d9f37a..60bed94f 100644
--- a/orm/src/main/java/com/zfoo/orm/util/MongoIdUtils.java
+++ b/orm/src/main/java/com/zfoo/orm/util/MongoIdUtils.java
@@ -63,7 +63,7 @@ public abstract class MongoIdUtils {
                 return document.getLong("count") + 1;
             }
         } catch (Throwable t) {
-            logger.info("getIncrementIdFromMongo collection:[{}] document:[{}] default error", collectionName, documentName, t);
+            logger.error("getIncrementIdFromMongo collection:[{}] document:[{}] default error", collectionName, documentName, t);
         }
 
         var query = Filters.eq("_id", documentName);
@@ -75,7 +75,7 @@ public abstract class MongoIdUtils {
                 var document = collection.findOneAndUpdate(query, Updates.combine(inc, setOnInsert), new FindOneAndUpdateOptions().upsert(true));
                 return null == document ? INIT_ID : document.getLong(COUNT) + 1;
             } catch (Throwable t) {
-                logger.info("getIncrementIdFromMongo collection:[{}] document:[{}] retry error! ", collectionName, documentName, t);
+                logger.error("getIncrementIdFromMongo collection:[{}] document:[{}] retry error! ", collectionName, documentName, t);
             }
         }
 
diff --git a/protocol/src/main/java/com/zfoo/protocol/util/ThreadUtils.java b/protocol/src/main/java/com/zfoo/protocol/util/ThreadUtils.java
index f4bcee06..0da22fd8 100644
--- a/protocol/src/main/java/com/zfoo/protocol/util/ThreadUtils.java
+++ b/protocol/src/main/java/com/zfoo/protocol/util/ThreadUtils.java
@@ -13,6 +13,7 @@
 package com.zfoo.protocol.util;
 
 import com.zfoo.protocol.collection.concurrent.CopyOnWriteHashMapLongObject;
+import com.zfoo.protocol.model.Pair;
 import io.netty.util.concurrent.EventExecutorGroup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,25 +41,6 @@ public abstract class ThreadUtils {
         }
     }
 
-    /**
-     * 通过线程号寻找对应的线程
-     */
-    public static Thread findThread(long threadId) {
-        var group = Thread.currentThread().getThreadGroup();
-        while (group != null) {
-            var threads = new Thread[group.activeCount() * 2];
-            var count = group.enumerate(threads, true);
-            for (var i = 0; i < count; i++) {
-                if (threadId == threads[i].getId()) {
-                    return threads[i];
-                }
-            }
-            group = group.getParent();
-        }
-        return null;
-    }
-
-
     public static void shutdown(ExecutorService executor) {
         try {
             if (!executor.isTerminated()) {
@@ -127,14 +109,38 @@ public abstract class ThreadUtils {
     }
 
     // -----------------------------------------------------------------------------------------------------------------
-    // threadId -> Executor
-    private static final CopyOnWriteHashMapLongObject<Executor> threadExecutorMap = new CopyOnWriteHashMapLongObject<>(Runtime.getRuntime().availableProcessors() * 8);
-    public static void registerExecutor(long threadId, Executor executor) {
-        threadExecutorMap.put(threadId, executor);
+    // threadId -> (Thread, Executor)
+    private static final CopyOnWriteHashMapLongObject<Pair<Thread, Executor>> threadExecutorMap = new CopyOnWriteHashMapLongObject<>(Runtime.getRuntime().availableProcessors() * 8);
+
+    public static void registerSingleThreadExecutor(Thread thread, Executor executor) {
+        threadExecutorMap.put(thread.getId(), new Pair<>(thread, executor));
     }
 
     public static Executor executorByThreadId(long threadId) {
-        return threadExecutorMap.get(threadId);
+        var threadExecutor = threadExecutorMap.getPrimitive(threadId);
+        return threadExecutor == null ? null : threadExecutor.getValue();
     }
 
+    /**
+     * search for the corresponding thread by the thread id
+     */
+    public static Thread findThread(long threadId) {
+        var threadExecutor = threadExecutorMap.getPrimitive(threadId);
+        if (threadExecutor != null) {
+            return threadExecutor.getKey();
+        }
+
+        var group = Thread.currentThread().getThreadGroup();
+        while (group != null) {
+            var threads = new Thread[group.activeCount() * 2];
+            var count = group.enumerate(threads, true);
+            for (var i = 0; i < count; i++) {
+                if (threadId == threads[i].getId()) {
+                    return threads[i];
+                }
+            }
+            group = group.getParent();
+        }
+        return null;
+    }
 }
diff --git a/scheduler/src/main/java/com/zfoo/scheduler/manager/SchedulerBus.java b/scheduler/src/main/java/com/zfoo/scheduler/manager/SchedulerBus.java
index 64859d7a..5420572f 100644
--- a/scheduler/src/main/java/com/zfoo/scheduler/manager/SchedulerBus.java
+++ b/scheduler/src/main/java/com/zfoo/scheduler/manager/SchedulerBus.java
@@ -83,7 +83,7 @@ public abstract class SchedulerBus {
             thread.setDaemon(false);
             thread.setPriority(Thread.NORM_PRIORITY);
             thread.setUncaughtExceptionHandler((t, e) -> logger.error(t.toString(), e));
-            ThreadUtils.registerExecutor(thread.getId(), executor);
+            ThreadUtils.registerSingleThreadExecutor(thread, executor);
             return thread;
         }