Implements cache tags for query builder from issue #2630
Also refactors builder tests for cache
Fix docblock
Merge pull request #2687 from karptonite/builder_tags

Implements cache tags for query builder from issue #2630