Merge "Fix free_cache to actually work" into ics-mr1