Fix sorted results containing None after reverting an older wrong caching fix
Don't depend on djangae, fall back to ListField from djangotoolbox
Fix a few things forgotten in the refactor