Factored the graphical test out of the main class;
made some member classes public so they can be used
Corrected Cache implementation