A few minor cleanups and fixes

1) Sync the announcer logic with what is in place for 0.6.52.x
2) Fix caching bug with select queries