Update templates for Docker 1.13 caching