Cache and chart swap support
UI improvements