Fix Provider to cache what they are providing (Singleton behavior)