Changed the order of ADD to use cache for reducing build time