Moving Singleton to Scoped