Removed memcaching, small template fix