tweaks to client cache logic