SYNR-537, SYNR-539, and SYNR-541

More fixes to caching logic.  The client works without these, but some extraneous downloads might happen.