Some improvements to the timeoutCache
More comments in the websockets