fix #14

Quick patch #2 Added caching for 25 minutes