Merge pull request #2719 from GDmac/develop

Fix #2406 query builder cache