[Preprocessor] Cache, CLI cleaned up.