Fixed issue when building the cache key