Improvements for caching efficiency & speed