#1563058 caching fix when using CMS as editor