am cf229bb0: make consistent with new RegisteredServicesCache API

Merge commit 'cf229bb013317db77034980c212ab07bea260261' into eclair-mr2

* commit 'cf229bb013317db77034980c212ab07bea260261':
  make consistent with new RegisteredServicesCache API