Added XML comments and tweaked cache client