Fixes issue where incorrect cache key was being used