Cool.  I'll switch it to the cache system, re-test and merge tonight.