Fix allow empty content and not caching fallback content
More tests and coverage
More coverage