Updates to client side caching