Added WhenFactory for use when not using DI (hk2/guice)