Got the Button class to use the new CachedSurface base.