Merged @ddavila fix for my typos (thanks). And changed the AOD for MINIAOD since we are caching is MINIAOD and not AOD.
@ddavila can you review and merge please?