Removed unnecessary caching