change cache name, fix a logic