More extensive caching
Hardening of utils, null checking