Persist token expiry info

@settinghead please review