tweak Dockerfile for more efficient cache (again)