Better cache handling