Merge branch 'hotfix/#7030-captcha-support-in-form-row-helper'

Close #7030
Cache: fixed some minor documentation issues
Merge branch 'hotfix/#7033-minor-cache-docblock-fixes' into develop

Close #7033
Forward port #7033