Issue 2982 new folder cache flush