Thanks for the help Dyorgio.

Steve Ebersole would a pull request for this (using WeakReference to avoid the memory leak) require additional unit tests in order to be accepted?