I agree, though if we swap to proxying ICache, we don't need to update the tests any more.  Added this as a separate task - https://github.com/JabbR/JabbR/issues/1081