restore focus
enable cache for entity REST API
Merge pull request #473 from dennishendriksen/master

Enable entity REST API caching + restore focus