added allow-query-cache option
Merge commit '1b158cb'