Add public caching