Merging master into unified-builtins

   - adding the latest fixes to the caching mechanism.

@dwightguth please review.