fixing tests... adding dtc back.. may consider caching
it needs to be ConcurrentHashMap on caches now
more optimizations