Improved cacheCurrentParent and added it to container updae methods