Removed unneeded caching.