JARVIS-485 added support for query cache option
JARVIS-485 fixed typo
Merge branch 'feature/JARVIS-485' into develop