Added entity type and bundle to content cache key.