working completion cache
Added query handler. <incomplete commit>