Added enable_cache method and assembly