Move stats to new controller #19
Fix caching