Re apply *3696* fix for moving TinyMCE cache