Added cache expiration to stocks, minor cleanup