Uses new cache infrastructure