More cache fixes. Some things are still broken..