Merge change I25f2afba into eclair

* changes:
  Check if a device is added to the cache before returning.