- Move expiring collections to util.expiring package - Change ExpiringSet to remove expired entries during normal calls