cachedb_sql: properly fix git conflict (from f7d30b6e)
(cherry picked from commit b0deb69be94633472681eb91dddb3b63f0be8bd5)