changed cache key to Type