Removed less refined form of caching.