Removed unnecessary caching.