CacheEntry now part of the namespace chart.
Minor cleanup, dependencies reduced.