add cache everywhere