fix comment removal, expose cache