From 2a5640bea09ace462038c676a149866b438a980d Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 17 Aug 2021 19:51:41 +1200
Subject: [PATCH] dev/core#2763 cache clearing fix

---
 CRM/Core/Config.php | 2 ++
 CRM/Core/Invoke.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CRM/Core/Config.php b/CRM/Core/Config.php
index aef4a308b8..6ca6e68ea4 100644
--- a/CRM/Core/Config.php
+++ b/CRM/Core/Config.php
@@ -278,6 +278,8 @@ class CRM_Core_Config extends CRM_Core_Config_MagicMerge {
     // clear all caches
     self::clearDBCache();
     Civi::cache('session')->clear();
+    Civi::cache('metadata')->clear();
+    CRM_Core_DAO_AllCoreTables::reinitializeCache();
     CRM_Utils_System::flushCache();
 
     if ($sessionReset) {
diff --git a/CRM/Core/Invoke.php b/CRM/Core/Invoke.php
index ec0087efac..12db074dc8 100644
--- a/CRM/Core/Invoke.php
+++ b/CRM/Core/Invoke.php
@@ -399,7 +399,7 @@ class CRM_Core_Invoke {
       // For example - when uninstalling an extension. We already set "triggerRebuild" to true for these operations.
       $config->userSystem->invalidateRouteCache();
     }
-    CRM_Core_DAO_AllCoreTables::reinitializeCache();
+
     CRM_Core_ManagedEntities::singleton(TRUE)->reconcile();
   }
 
-- 
2.25.1