Merge branch 'joelagnel-cache-corrupt-fix'