Bug 1021728 - Use the new cache API. r=aeftimie