Bugfix: when expiry is in the past, we should expire now not fall back. Could short circuit this to do better