[API] Less invasive session management in Client.