Merge "Restrict empty-frame cache entries to their parent"