clean up the code
change cache routine