Improved Dockerfile to properly utilize layer caching.