Change EntityCache to use internal implementations for everything that is available and not DIRECTLY what is being asked for... .IsTarget chesks other things but ultimately still returns )directEntity.IsTarget (same for everything else in entitycache)