Fixed issues with caching and Master results

Related to cache keys and master results having an age column