HG-57 add server caching
HG-57 merge from master
HG-57 remove comment
HG-57 fix tab
Merge pull request #51 from Wikia/HG-57

HG-57 add server caching