Fix queries, cache when available only