I've resurrected the original pull request.
This should reduce disk access. Please tell us whether this helps or not.