Moved CharmProvider to CharmCache