Fixed #13285: populate_xheaders breaks caching