Changed session handling so that it is no longer set per call but on client level