[4.2] Cache Docblock Fixes

Just a few minor fixes here.