+ Major cleanup
+ Added comments and DONE marker
Fixed issues with not using merged task instance in the cache