Adding server+client, client+server cache test
Merge pull request #399 from wpreul/bug/cache

Adding server+client, client+server cache test