From 2583f7fde341453dec38e15f9ba73ec8963cb4f6 Mon Sep 17 00:00:00 2001
From: Daniel Vaz Gaspar <danielvazgaspar@gmail.com>
Date: Sat, 10 Sep 2022 01:02:24 +0100
Subject: [PATCH] fix: cached common bootstrap Revert (#21018) (#21419)

(cherry picked from commit 094400c308b7e16fbabc9c4287054c298ff95899)
---
 superset/views/base.py                | 8 +-------
 tests/integration_tests/core_tests.py | 4 +---
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/superset/views/base.py b/superset/views/base.py
index f5a8c301841c9..9460b8d1aee69 100644
--- a/superset/views/base.py
+++ b/superset/views/base.py
@@ -71,7 +71,6 @@
     SupersetException,
     SupersetSecurityException,
 )
-from superset.extensions import cache_manager
 from superset.models.helpers import ImportExportMixin
 from superset.models.reports import ReportRecipientType
 from superset.superset_typing import FlaskResponse
@@ -344,13 +343,8 @@ def menu_data() -> Dict[str, Any]:
     }
 
 
-@cache_manager.cache.memoize(timeout=60)
 def common_bootstrap_payload() -> Dict[str, Any]:
-    """Common data always sent to the client
-
-    The function is memoized as the return value only changes based
-    on configuration and feature flag values.
-    """
+    """Common data always sent to the client"""
     messages = get_flashed_messages(with_categories=True)
     locale = str(get_locale())
 
diff --git a/tests/integration_tests/core_tests.py b/tests/integration_tests/core_tests.py
index 6aa1eac0ecf1d..58943246c545b 100644
--- a/tests/integration_tests/core_tests.py
+++ b/tests/integration_tests/core_tests.py
@@ -62,7 +62,7 @@
 from superset.db_engine_specs.base import BaseEngineSpec
 from superset.db_engine_specs.mssql import MssqlEngineSpec
 from superset.exceptions import SupersetException
-from superset.extensions import async_query_manager, cache_manager
+from superset.extensions import async_query_manager
 from superset.models import core as models
 from superset.models.annotations import Annotation, AnnotationLayer
 from superset.models.dashboard import Dashboard
@@ -1400,8 +1400,6 @@ def test_feature_flag_serialization(self):
         """
         Functions in feature flags don't break bootstrap data serialization.
         """
-        # feature flags are cached
-        cache_manager.cache.clear()
         self.login()
 
         encoded = json.dumps(