Added caching
Should probably make this accessible from Api