diff --git a/kernel/api/setting.go b/kernel/api/setting.go
index 45c05fc16..13e870b2e 100644
--- a/kernel/api/setting.go
+++ b/kernel/api/setting.go
@@ -221,7 +221,6 @@ func setSearch(c *gin.Context) {
 	if s.CaseSensitive != oldCaseSensitive {
 		model.FullReindex()
 	}
-	sql.ClearVirtualRefKeywords()
 	ret.Data = s
 }
 
diff --git a/kernel/model/backlink.go b/kernel/model/backlink.go
index 9984a2545..f0eee898f 100644
--- a/kernel/model/backlink.go
+++ b/kernel/model/backlink.go
@@ -167,7 +167,7 @@ func buildBacklink(refID string, refTree *parse.Tree, keywords []string, luteEng
 					return ast.WalkContinue
 				}
 
-				markReplaceSpan(n, &unlinks, keywords, searchMarkDataType, luteEngine)
+				markReplaceSpan(n, &unlinks, keywords, search.MarkDataType, luteEngine)
 				return ast.WalkContinue
 			})
 
@@ -690,7 +690,7 @@ func searchBackmention(mentionKeywords []string, keyword string, excludeBacklink
 			continue
 		}
 
-		newText := markReplaceSpanWithSplit(text, mentionKeywords, getMarkSpanStart(searchMarkDataType), getMarkSpanEnd())
+		newText := markReplaceSpanWithSplit(text, mentionKeywords, search.GetMarkSpanStart(search.MarkDataType), search.GetMarkSpanEnd())
 		if text != newText {
 			tmp = append(tmp, b)
 		}
diff --git a/kernel/model/history.go b/kernel/model/history.go
index b4a7ffcfb..8fefad3e4 100644
--- a/kernel/model/history.go
+++ b/kernel/model/history.go
@@ -180,7 +180,7 @@ func GetDocHistoryContent(historyPath, keyword string) (id, rootID, content stri
 			n.RemoveIALAttr("fold")
 
 			if 0 < len(keywords) {
-				if markReplaceSpan(n, &unlinks, keywords, searchMarkDataType, luteEngine) {
+				if markReplaceSpan(n, &unlinks, keywords, search.MarkDataType, luteEngine) {
 					return ast.WalkContinue
 				}
 			}
diff --git a/kernel/sql/block_ref_query.go b/kernel/sql/block_ref_query.go
index b938e2049..93b066e0f 100644
--- a/kernel/sql/block_ref_query.go
+++ b/kernel/sql/block_ref_query.go
@@ -29,11 +29,6 @@ import (
 )
 
 func QueryVirtualRefKeywords(name, alias, anchor, doc bool) (ret []string) {
-	ret, ok := getVirtualRefKeywordsCache()
-	if ok {
-		return ret
-	}
-
 	if name {
 		ret = append(ret, queryNames()...)
 	}
@@ -50,7 +45,6 @@ func QueryVirtualRefKeywords(name, alias, anchor, doc bool) (ret []string) {
 	sort.SliceStable(ret, func(i, j int) bool {
 		return len(ret[i]) >= len(ret[j])
 	})
-	setVirtualRefKeywords(ret)
 	return
 }
 
diff --git a/kernel/sql/database.go b/kernel/sql/database.go
index 8ab68b15a..3b8dc0732 100644
--- a/kernel/sql/database.go
+++ b/kernel/sql/database.go
@@ -67,7 +67,7 @@ func InitDatabase(forceRebuild bool) (err error) {
 	initDatabaseLock.Lock()
 	defer initDatabaseLock.Unlock()
 
-	ClearBlockCache()
+	ClearCache()
 	disableCache()
 	defer enableCache()
 
@@ -888,7 +888,7 @@ func deleteBlocksByBoxTx(tx *sql.Tx, box string) (err error) {
 	if err = execStmtTx(tx, stmt, box); nil != err {
 		return
 	}
-	ClearBlockCache()
+	ClearCache()
 	return
 }
 
@@ -1012,7 +1012,7 @@ func deleteByRootID(tx *sql.Tx, rootID string, context map[string]interface{}) (
 	if err = execStmtTx(tx, stmt, rootID); nil != err {
 		return
 	}
-	ClearBlockCache()
+	ClearCache()
 	eventbus.Publish(eventbus.EvtSQLDeleteBlocks, context, rootID)
 	return
 }
@@ -1048,7 +1048,7 @@ func batchDeleteByRootIDs(tx *sql.Tx, rootIDs []string, context map[string]inter
 	if err = execStmtTx(tx, stmt); nil != err {
 		return
 	}
-	ClearBlockCache()
+	ClearCache()
 	eventbus.Publish(eventbus.EvtSQLDeleteBlocks, context, fmt.Sprintf("%d", len(rootIDs)))
 	return
 }
@@ -1082,7 +1082,7 @@ func batchDeleteByPathPrefix(tx *sql.Tx, boxID, pathPrefix string) (err error) {
 	if err = execStmtTx(tx, stmt, boxID, pathPrefix+"%"); nil != err {
 		return
 	}
-	ClearBlockCache()
+	ClearCache()
 	return
 }
 
@@ -1099,7 +1099,7 @@ func batchUpdateHPath(tx *sql.Tx, boxID, rootID, oldHPath, newHPath string) (err
 	if err = execStmtTx(tx, stmt, newHPath, boxID, rootID, oldHPath); nil != err {
 		return
 	}
-	ClearBlockCache()
+	ClearCache()
 	return
 }