Support expiring subscriptions

Implementation of #634