Updated how names are generated for cache