Optimize loading/storing revoked tasks. Closes #1289