Merged continuous cached query branch to master

Deleting the old branch as I did this manually without git.