Extra cache validation for pre-commit jobs

Jobs that update the cache of APK packages and pre-commit environments now run an extra clean-up to avoid keeping outdated and unused files.

enabled an automatic merge when all merge checks for 28522e25 pass

merged