Adding JavaDocs + fixing caching issue.