NXP-13321 limit query to one entry
NXP-13315 Avoid NPE
NXP-13315 improve invalidations