Fixed cache doc blocks
Merge pull request #5059 from GrahamCampbell/4.2-cachedocs

[4.2] Cache Docblock Fixes