Update the @FactoryType annotation to remove the spring ref and prepare for possible package changes for 3.1