Moved cache key creation to a separate, static function...