Some cache-related changes