add moments caching