incremental compiler caches: code cleanup and simplification