Merge pull request #1100 from rrdial/2.1-stable

2.1-stable: bug fix: compile binds before caching the query…