Cache refactor, batch 2
Merge branch 'master' of https://github.com/omegaup/omegaup