Improve docker caching