Made Cache a static class.

Cache is never instantiated and contains only static variables and member functions. Made it a static class.
Moved the LINQ query to FirstOrDefault.

There Where() method is unneeded here, moved the query to FirstOrDefault().
Merge remote-tracking branch 'upstream/master'
Merge pull request #50 from ajjohnston/master

Some more cleanups