Make some caching changes