Implement more efficient/flexible wrapper cache system