clean up and maybe cache
clean up and maybe cache