Convert to XBlock services
Make metadata inheritance caching operate over all blocks with children