Bug 1038020 - Add caching to One and Done to improve performance