NXP-13315 more caching