Header file update, clean up and cache handling