Improve the data caching workflow