Adding caching
Merge branch 'master' of github.com:controlshift/prague-server