updating handling of cache key suffix