Refactoring to facilitate caching of CMIS objects.