Improve local data caching