add query caching
Merge branch 'master' of https://github.com/veronica41/CharacterLab