Bunch of tiny updates for adding clearing of caching, and cachings