Enable/disable cache calls and some other cleanup
Cache flush
Cleanup