Added explicit handling of none-moves in in non-bonded-cached