CMS-1127 Use our own FactoryBean that acts like a provider