Merge "Revert^3 "Do not cache bag parent stack until requested""