Fixed #13285: populate_xheaders breaks caching
Merge pull request #1122 from ambv/issue13285

Fixed #13285: populate_xheaders breaks caching