Noddity 2.2.3

Caching fixes