Ensure cachedproperty descriptor picks up docstrings

Closes-Bug: #1325677

Change-Id: I6366dea5458adec30e945a9834e15da946813461
Merge "Ensure cachedproperty descriptor picks up docstrings"