Remove some more caching