Use uncached EntityLookup during testin

Change-Id: I4db73ab031d959d24ba138f4b80f1b5bbe2fa17f
Merge "Use uncached EntityLookup during testin"