Upgrade dockerfile so that it could benefit from cache