Move DI container construction to singleton