"server-cache" breaking changes/testing + fixes

Hi - your friendly github stalker here :)

I see your still working on server-cache branch but thought I would test and see if can fix some bugs.
Found two breaking changes so far. Attached are simple pull requests.

Hope it helps.

If you need any help with testing/dev don't hesitate to drop me a mail would love to help out.

PS: Nice to see your planning on the dict of dict and hopeful caching, I never got round to it to be honest.

Cheers,
Wez