Minor fixes to server and cached

response to comments by @cpcloud