Fix tests (DMS) to use by default Cache Bags.
Fix some dead code and clean up.
Move cache initialization away from DMS into Cache Factory.