Fix cache clean not working correctly when a package + non-server was specified.