Improve initial caching efficiency