added CacheDbDependencyResolver and fixed issue where we were caching the first resolved instead of the last resolved when wrapping was involved.