SYNR-537 and SYNR-539

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