Fix issue with cache dropping on client side