Implement Supply.uniq( :with, :expires)

And fix Supply.uniq( :expires ) (without :with)