Minor changes, cache