That's correct, the calls end up in the storage abstraction. If that gets accepted then the callers could simply call he storage through the session, alleviating the confusion.