cleaned up some caching in the tab switching