Merge "Rewrite i-cache test"