Cache updates, minor fixes