adjust toc, add subs for cache [ci-skip]