update caching spec for build order change
Clean up build order changes and exceptions