bugfixes for NEP

some issues came up during stress tests. As a bonus, descriptor number
will be now cached