Server level cache
Merge pull request #994 from spumko/issue/954

Server level cache