Remove potential  cache key collision
Use setUpClass in tests
Remove redundant migrations
Merge branch 'feature/cache_prefs_collisions' into develop