Remove obsolete stuff.
Also change the cache into a reusable object.
Merge remote-tracking branch 'origin/master'