Several fixes to nqCache