Improved potential memory leak on the console window for some users.

Improved data caching to increase performance