diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp
index e58495b014..9c37b08d8b 100644
--- a/eeschema/sch_edit_frame.cpp
+++ b/eeschema/sch_edit_frame.cpp
@@ -1517,6 +1517,14 @@ void SCH_EDIT_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVars
     view->SetLayerVisible( LAYER_ERC_WARN, cfg->m_Appearance.show_erc_warnings );
     view->SetLayerVisible( LAYER_ERC_EXCLUSION, cfg->m_Appearance.show_erc_exclusions );
 
+    SCH_SCREEN* screen = GetCurrentSheet().LastScreen();
+
+    for( SCH_ITEM* item : screen->Items() )
+        item->ClearCaches();
+
+    for( std::pair<const wxString, LIB_SYMBOL*>& libSymbol : screen->GetLibSymbols() )
+        libSymbol.second->ClearCaches();
+
     GetCanvas()->ForceRefresh();
 
     RecreateToolbars();
diff --git a/eeschema/symbol_editor/symbol_edit_frame.cpp b/eeschema/symbol_editor/symbol_edit_frame.cpp
index 42794fbd4c..b0f0d5a837 100644
--- a/eeschema/symbol_editor/symbol_edit_frame.cpp
+++ b/eeschema/symbol_editor/symbol_edit_frame.cpp
@@ -1104,6 +1104,9 @@ void SYMBOL_EDIT_FRAME::CommonSettingsChanged( bool aEnvVarsChanged, bool aTextV
 
     GetGalDisplayOptions().ReadWindowSettings( cfg->m_Window );
 
+    if( m_symbol )
+        m_symbol->ClearCaches();
+
     GetCanvas()->ForceRefresh();
 
     RecreateToolbars();