Some more cleanup (caching works now again), refs #998