instead of storing both a raw pointer and an uno::Reference

Change-Id: I71c9cc4cc643d4b73a34b74c803378da75fd8de0