Remove initial "select count()" in cache code. It's way too expensive on
large tables.
Merge branch 'public/7.7' into public/7.8