add more aggressive caching