Re-work DI heirarchy. Cleanup.
Keep session entry keys in utf-8.