remembering, caching issue fixed