Cache improvements
cvs ignore