Filter capabilities XML
Add missing copyright
Add missing tests
Better cache when we don't deffer on user