Move constants to static properties and add cache
Merge pull request #1 from aadsm/pr-1250

Pr 1250