DON'T MERGE YET - "ExpiryPolicy" cleanup on "ICache"