Minor tweaking of EntityCacheBase to silence some warnings.