Minor refactoring of cache code
Minor refactoring of cache code

beni55/wai,mfine/wai,awpr/wai,AndrewRademacher/wai,tolysz/wai,awpr/wai,coypoop/wai,kazu-yamamoto/wai,tolysz/wai,sordina/wai,jberryman/wai,AndrewRademacher/wai,erikd/wai,sordina/wai,mfine/wai,soenkehahn/wai,sol/wai,tolysz/wai,utdemir/wai,mfine/wai,utdemir/wai,iquiw/wai,urbanslug/wai,beni55/wai,urbanslug/wai,creichert/wai,iquiw/wai,coypoop/wai,dylex/wai,creichert/wai,jberryman/wai,frontrowed/wai,sol/wai,AndrewRademacher/wai,erikd/wai,jberryman/wai,sordina/wai,rgrinberg/wai,beni55/wai,beni55/wai,ygale/wai,utdemir/wai,erikd/wai,kazu-yamamoto/wai,ygale/wai,frontrowed/wai,sol/wai,dylex/wai,yesodweb/wai,awpr/wai,urbanslug/wai,jberryman/wai,erikd/wai,ygale/wai,frontrowed/wai,sordina/wai,rgrinberg/wai,frontrowed/wai,mfine/wai,soenkehahn/wai,yesodweb/wai,rgrinberg/wai,urbanslug/wai,ygale/wai,awpr/wai,dylex/wai,iquiw/wai,rgrinberg/wai,iquiw/wai,AndrewRademacher/wai,soenkehahn/wai,tolysz/wai,rgrinberg/wai,coypoop/wai,coypoop/wai,soenkehahn/wai,dylex/wai,utdemir/wai