Merge pull request #1731 from hmen89/8.0-pos-dom-cache-fix