Using client-side storage for older tokens