Ensured objects are enabled by default with optional disable Optimised cache lookup Added danger checks to objects in cache