Make cache selection a little smarter