[CLEANUP] Global Cacher cleanup before PR