ServiceRegistry is the only supported access to the Java Public API.
So it should return only services part of that API.
Currently additional services (e.g. CalendarService) are part of it and should be removed.
In order to keep backward compatibility the proposal is to mark those methods as @deprecated and clearly state in the javadocs when a method returns a non public API class.
This allows potentially for removal of these methods in a next version.