Removed too-aggressive caching