More cache manager updates, cleanup