As no tracking

Moving the decision to used cached values upstream to query evaluation when .AsNoTracking is set.  When this is set, we never use cached values and instead query the database when the value is requested.  
will remove commented code