Remove tab caching and use layout caching only