Added caching to Cabinet pointers