Removed caching (no memcache yet) and prepared for cloud deployment