Changing from @Singleton to @PerLookup