NTK: Don't keep unneeded clients in session when switching.