Updated timing to use session storage as fallback.