document traits with generic names
Merge pull request #6681 from Mailaender/document-basic-traits

Documented traits with generic names
Revert cachedLocation change that caused issues with transports.

This partially reverts commit 2f5ac1a360342e180f24ac2289cf34fcb0b21045.