#1563058 caching fix revert, was not a fix...