Cache key and specs fixes