Solve #22353 and a couple other CachedStaticFiles warts for MMF

See https://code.djangoproject.com/ticket/22353#ticket