Additional packages and cache dir changes