#986 - Keep session locks in a separate map