Fix test errors (it's weird, that the name of field always isn't right, super natural!!!)
Add caching and logging and tests