Swap dependency injection with SessionStore.

Signed-off-by: crynobone <crynobone@gmail.com>
Fixed invalid typehinting from previous commit.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1'