Updated the caching policies. Perf is much better.