fix amara, add cli subs cacher