Better cache support