Merge "Build cache.img on demand"