Lesson caching and removed empty filter