return 404 instead of exception if model can't be found
Merge remote-tracking branch 'origin/caching' into caching