Makes sense. I'm yet not sure if we should still be putting it at all in the context, because we do not use it anymore in SSL. I left it there just in case. 
Yet I agree is better to have the repository so we do not have to look it up again.