Improve caching for docker loading