Added cache on developer (as was done on organization)
Removed useless line of comments
Maked finder work with api.