Updated with docs remap, and make it cacheable