Client-side of refactored CJ session restoration