Removed environment dependant configurations, added properties caching