Make expiration behaviour opt-in.