CLDINT-1897: Enhanced objects are duplicated in result of getComponentAdaptersOfType/getComponentInstancesOfType