Incorporated review comments around caching, adding comments and renaming
Fixing build errors