revert: Change startup caching mechanism