#785 Singletons have to be explicitly specified. Otherwise we get one instance per inject, resulting in various nice race conditions that cannot be that easily repaired...