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

Ignore the first commit, it's already on master.