Merge "fix NullPointerException in RegisteredServicesCache"