Prefix cached queries with $ and format a little