bugfix: do not keep state in DataSourceFactoryHelper