changed cache/query system