Repository cache now supports service locator