CLC-2565 Use different cache keys for has-history lookups