WIP: update for compat with new expiryservice pattern