diff --git a/superset/models/core.py b/superset/models/core.py
index 25beb2bee377..3f5a5cb2f3ec 100755
--- a/superset/models/core.py
+++ b/superset/models/core.py
@@ -511,7 +511,7 @@ def inspector(self) -> Inspector:
 
     @cache_util.memoized_func(
         key="db:{self.id}:schema:None:table_list",
-        cache=cache_manager.data_cache,
+        cache=cache_manager.cache,
     )
     def get_all_table_names_in_database(  # pylint: disable=unused-argument
         self,
@@ -531,7 +531,7 @@ def get_all_table_names_in_database(  # pylint: disable=unused-argument
 
     @cache_util.memoized_func(
         key="db:{self.id}:schema:None:view_list",
-        cache=cache_manager.data_cache,
+        cache=cache_manager.cache,
     )
     def get_all_view_names_in_database(  # pylint: disable=unused-argument
         self,
@@ -551,7 +551,7 @@ def get_all_view_names_in_database(  # pylint: disable=unused-argument
 
     @cache_util.memoized_func(
         key="db:{self.id}:schema:{schema}:table_list",
-        cache=cache_manager.data_cache,
+        cache=cache_manager.cache,
     )
     def get_all_table_names_in_schema(  # pylint: disable=unused-argument
         self,
@@ -582,7 +582,7 @@ def get_all_table_names_in_schema(  # pylint: disable=unused-argument
 
     @cache_util.memoized_func(
         key="db:{self.id}:schema:{schema}:view_list",
-        cache=cache_manager.data_cache,
+        cache=cache_manager.cache,
     )
     def get_all_view_names_in_schema(  # pylint: disable=unused-argument
         self,
@@ -613,7 +613,7 @@ def get_all_view_names_in_schema(  # pylint: disable=unused-argument
 
     @cache_util.memoized_func(
         key="db:{self.id}:schema_list",
-        cache=cache_manager.data_cache,
+        cache=cache_manager.cache,
     )
     def get_all_schema_names(  # pylint: disable=unused-argument
         self,