Fixed some cache version issues