Improve caching of data
Improve the metric of how long it took to publish
Use the sub-container