Entity Mananagwe & CachedDBC fix