More work on session and socket data expiry