Added in CacheConnector and tests